Moved config check for ldap into ldap init.

We need a global config changed hook of some description so that
the server does not need to be restarted when ldap is enabled/disabled.

diff --git a/citadel/modules/ldap/serv_ldap.c b/citadel/modules/ldap/serv_ldap.c
index 018a1f845f8ecd7ec9be5cfdb4a5c0ab767420c4..55af94521ec63c7d99a03839159504442973bfa1 100644 (file)
--- a/citadel/modules/ldap/serv_ldap.c
+++ b/citadel/modules/ldap/serv_ldap.c
@@ -417,16 +417,15 @@ int CtdlDeleteFromLdap(char *cn, char *ou, void **object)
 CTDL_MODULE_INIT(ldap)
 {
 #ifdef HAVE_LDAP
-       CtdlRegisterCleanupHook(serv_ldap_cleanup);
-       CtdlRegisterDirectoryServiceFunc(CtdlDeleteFromLdap, DIRECTORY_USER_DEL, "ldap");
-       CtdlRegisterDirectoryServiceFunc(CtdlCreateLdapHostOU, DIRECTORY_CREATE_HOST, "ldap");
-       CtdlRegisterDirectoryServiceFunc(CtdlCreateLdapObject, DIRECTORY_CREATE_OBJECT, "ldap");
-       CtdlRegisterDirectoryServiceFunc(CtdlAddLdapAttr, DIRECTORY_ATTRIB_ADD, "ldap");
-       CtdlRegisterDirectoryServiceFunc(CtdlSaveLdapObject, DIRECTORY_SAVE_OBJECT, "ldap");
-       CtdlRegisterDirectoryServiceFunc(CtdlFreeLdapObject, DIRECTORY_FREE_OBJECT, "ldap");
-       
-
-       if (!IsEmptyStr(config.c_ldap_host)) {
+       if (!IsEmptyStr(config.c_ldap_base_dn))
+       {
+               CtdlRegisterCleanupHook(serv_ldap_cleanup);
+               CtdlRegisterDirectoryServiceFunc(CtdlDeleteFromLdap, DIRECTORY_USER_DEL, "ldap");
+               CtdlRegisterDirectoryServiceFunc(CtdlCreateLdapHostOU, DIRECTORY_CREATE_HOST, "ldap");
+               CtdlRegisterDirectoryServiceFunc(CtdlCreateLdapObject, DIRECTORY_CREATE_OBJECT, "ldap");
+               CtdlRegisterDirectoryServiceFunc(CtdlAddLdapAttr, DIRECTORY_ATTRIB_ADD, "ldap");
+               CtdlRegisterDirectoryServiceFunc(CtdlSaveLdapObject, DIRECTORY_SAVE_OBJECT, "ldap");
+               CtdlRegisterDirectoryServiceFunc(CtdlFreeLdapObject, DIRECTORY_FREE_OBJECT, "ldap");
                CtdlConnectToLdap();
        }
 

diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c
index 0e8783ddf7cfe3d4903fadeb331c0cb0f953b9da..5ece955e1564b8c43b3f644a372c3754d40564b4 100644 (file)
--- a/citadel/modules/vcard/serv_vcard.c
+++ b/citadel/modules/vcard/serv_vcard.c
@@ -138,7 +138,7 @@ void vcard_extract_internet_addresses(struct CtdlMessage *msg,
  */
  
  
-void ctdl_vcard_to_ldap(struct CtdlMessage *msg, int op) {
+void ctdl_vcard_to_directory(struct CtdlMessage *msg, int op) {
        struct vCard *v = NULL;
        int i;
        int num_emails = 0;
@@ -357,10 +357,7 @@ void vcard_add_to_directory(long msgnum, void *data) {
                vcard_extract_internet_addresses(msg, vcard_directory_add_user);
        }
 
-#ifdef HAVE_LDAP
-       if (!IsEmptyStr(config.c_ldap_base_dn))
-               ctdl_vcard_to_ldap(msg, V2L_WRITE);
-#endif
+       ctdl_vcard_to_directory(msg, V2L_WRITE);
 
        CtdlFreeMessage(msg);
 }
@@ -1090,9 +1087,7 @@ void vcard_delete_remove(char *room, long msgnum) {
                   || (!strncasecmp(ptr, "Content-type: text/vcard", 24)) ) {
                        /* Bingo!  A vCard is being deleted. */
                        vcard_extract_internet_addresses(msg, CtdlDirectoryDelUser);
-#ifdef HAVE_LDAP
-                       ctdl_vcard_to_ldap(msg, V2L_DELETE);
-#endif
+                       ctdl_vcard_to_directory(msg, V2L_DELETE);
                }
                ptr = strchr((char *)ptr, '\n');
                if (ptr != NULL) ++ptr;