"LDAP: Could not connect to server.");
return -1;
}
+ else {
+ CtdlAideMessage(
+ "WARNING: populating an external LDAP address book is deprecated.\n"
+ "This function will be discontinued in a future release.\n"
+ "Please migrate to vCard-based address books as soon as possible.\n"
+ "Visit the Citadel support forum if you need further assistance.\n"
+ ,
+ "Warning: LDAP address book is deprecated"
+ );
+ }
ldap_set_option(dirserver, LDAP_OPT_PROTOCOL_VERSION,
&ldap_version);
*/
CTDL_MODULE_INIT(ldap)
{
+ if (!threading)
+ {
#ifdef HAVE_LDAP
- if (!IsEmptyStr(config.c_ldap_base_dn)) {
- CtdlRegisterCleanupHook(serv_ldap_cleanup);
- CtdlRegisterSessionHook(ldap_disconnect_timer, EVT_TIMER);
- CtdlRegisterDirectoryServiceFunc(delete_from_ldap,
- DIRECTORY_USER_DEL,
- "ldap");
- CtdlRegisterDirectoryServiceFunc(create_ldap_host_OU,
- DIRECTORY_CREATE_HOST,
- "ldap");
- CtdlRegisterDirectoryServiceFunc(create_ldap_object,
- DIRECTORY_CREATE_OBJECT,
- "ldap");
- CtdlRegisterDirectoryServiceFunc(add_ldap_object,
- DIRECTORY_ATTRIB_ADD,
- "ldap");
- CtdlRegisterDirectoryServiceFunc(save_ldap_object,
- DIRECTORY_SAVE_OBJECT,
- "ldap");
- CtdlRegisterDirectoryServiceFunc(free_ldap_object,
- DIRECTORY_FREE_OBJECT,
- "ldap");
- create_ldap_root();
- }
+ if (!IsEmptyStr(config.c_ldap_base_dn)) {
+ CtdlRegisterCleanupHook(serv_ldap_cleanup);
+ CtdlRegisterSessionHook(ldap_disconnect_timer, EVT_TIMER);
+ CtdlRegisterDirectoryServiceFunc(delete_from_ldap,
+ DIRECTORY_USER_DEL,
+ "ldap");
+ CtdlRegisterDirectoryServiceFunc(create_ldap_host_OU,
+ DIRECTORY_CREATE_HOST,
+ "ldap");
+ CtdlRegisterDirectoryServiceFunc(create_ldap_object,
+ DIRECTORY_CREATE_OBJECT,
+ "ldap");
+ CtdlRegisterDirectoryServiceFunc(add_ldap_object,
+ DIRECTORY_ATTRIB_ADD,
+ "ldap");
+ CtdlRegisterDirectoryServiceFunc(save_ldap_object,
+ DIRECTORY_SAVE_OBJECT,
+ "ldap");
+ CtdlRegisterDirectoryServiceFunc(free_ldap_object,
+ DIRECTORY_FREE_OBJECT,
+ "ldap");
+ create_ldap_root();
+ }
#endif /* HAVE_LDAP */
-
+ }
+
/* return our Subversion id for the Log */
return "$Id$";
}