Mercurial > dovecot > original-hg > dovecot-1.2
changeset 9066:a31fb9b7179a HEAD
auth: Fixed using ldap plugin.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Wed, 20 May 2009 14:04:25 -0400 |
parents | 411ee74cae35 |
children | e7792f4509e6 |
files | src/auth/db-ldap.c src/auth/passdb-ldap.c src/auth/userdb-ldap.c |
diffstat | 3 files changed, 18 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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,22 +1304,22 @@ #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); + passdb_unregister_module(&passdb_ldap_plugin); + userdb_unregister_module(&userdb_ldap_plugin); } #endif
--- 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 @@ 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,
--- 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 @@ 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,