← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/auth_pam/auth_pam.cc

Merge trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/auth_pam/auth_pam.cc
109
109
 
110
110
static Authentication *auth= NULL;
111
111
 
112
 
static int initialize(PluginRegistry &registry)
 
112
static int initialize(drizzled::plugin::Registry &registry)
113
113
{
114
114
  auth= new Auth_pam();
115
115
  registry.add(auth);
116
116
  return 0;
117
117
}
118
118
 
119
 
static int finalize(PluginRegistry &registry)
 
119
static int finalize(drizzled::plugin::Registry &registry)
120
120
{
121
121
 
122
122
  if (auth)