dovecot-1.2: auth: Fixed using ldap plugin.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/a31fb9b7179a
changeset: 9066:a31fb9b7179a
user:      Timo Sirainen <tss at iki.fi>
date:      Wed May 20 14:04:25 2009 -0400
description:
auth: Fixed using ldap plugin.

diffstat:

3 files changed, 22 insertions(+), 12 deletions(-)
src/auth/db-ldap.c     |   20 ++++++++++----------
src/auth/passdb-ldap.c |    7 ++++++-
src/auth/userdb-ldap.c |    7 ++++++-

diffs (71 lines):

diff -r 411ee74cae35 -r a31fb9b7179a src/auth/db-ldap.c
--- a/src/auth/db-ldap.c	Wed May 20 13:56:24 2009 -0400
+++ b/src/auth/db-ldap.c	Wed May 20 14:04:25 2009 -0400
@@ -1304,23 +1304,23 @@ void db_ldap_unref(struct ldap_connectio
 
 #ifndef BUILTIN_LDAP
 /* Building a plugin */
-extern struct passdb_module_interface passdb_ldap;
-extern struct userdb_module_interface userdb_ldap;
+extern struct passdb_module_interface passdb_ldap_plugin;
+extern struct userdb_module_interface userdb_ldap_plugin;
 
 void authdb_ldap_init(void);
 void authdb_ldap_deinit(void);
 
 void authdb_ldap_init(void)
 {
-	passdb_register_module(&passdb_ldap);
-	userdb_register_module(&userdb_ldap);
+	passdb_register_module(&passdb_ldap_plugin);
+	userdb_register_module(&userdb_ldap_plugin);
 
 }
 void authdb_ldap_deinit(void)
 {
-	passdb_unregister_module(&passdb_ldap);
-	userdb_unregister_module(&userdb_ldap);
-}
-#endif
-
-#endif
+	passdb_unregister_module(&passdb_ldap_plugin);
+	userdb_unregister_module(&userdb_ldap_plugin);
+}
+#endif
+
+#endif
diff -r 411ee74cae35 -r a31fb9b7179a src/auth/passdb-ldap.c
--- a/src/auth/passdb-ldap.c	Wed May 20 13:56:24 2009 -0400
+++ b/src/auth/passdb-ldap.c	Wed May 20 14:04:25 2009 -0400
@@ -422,7 +422,12 @@ static void passdb_ldap_deinit(struct pa
 	db_ldap_unref(&module->conn);
 }
 
-struct passdb_module_interface passdb_ldap = {
+#ifndef PLUGIN_BUILD
+struct passdb_module_interface passdb_ldap =
+#else
+struct passdb_module_interface passdb_ldap_plugin =
+#endif
+{
 	"ldap",
 
 	passdb_ldap_preinit,
diff -r 411ee74cae35 -r a31fb9b7179a src/auth/userdb-ldap.c
--- a/src/auth/userdb-ldap.c	Wed May 20 13:56:24 2009 -0400
+++ b/src/auth/userdb-ldap.c	Wed May 20 14:04:25 2009 -0400
@@ -152,7 +152,12 @@ static void userdb_ldap_deinit(struct us
 	db_ldap_unref(&module->conn);
 }
 
-struct userdb_module_interface userdb_ldap = {
+#ifndef PLUGIN_BUILD
+struct userdb_module_interface userdb_ldap =
+#else
+struct userdb_module_interface userdb_ldap_plugin =
+#endif
+{
 	"ldap",
 
 	userdb_ldap_preinit,