* serv_ldap.c: upon successful connect to an LDAP server, post an aide message warnin...

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 5b6bb0a69fae3a7b1f276d16a7d806f312f494f3..cbf7cadee17220e52f3f720d0d8a0829fa134d3a 100644 (file)
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -276,9 +276,9 @@ enum {
 /*
  * Authentication modes
  */
-#define AUTHMODE_NATIVE                0       /* native Citadel authentication */
-#define AUTHMODE_HOST          1       /* host integrated */
-#define AUTHMODE_LDAP          2       /* external LDAP authentication */
+#define AUTHMODE_NATIVE                0       /* Native (self-contained or "black box") */
+#define AUTHMODE_HOST          1       /* Authenticate against the host OS user database */
+#define AUTHMODE_LDAP          2       /* External LDAP authentication (NOT IMPLEMENTED) */
 
 #ifdef __cplusplus
 }

diff --git a/citadel/modules/expire/serv_expire.c b/citadel/modules/expire/serv_expire.c
index 2a585e5515f02068ef6f55fc43cc620d755fc225..d45ca51211e809c45cb8c926de6f3a2686de31ac 100644 (file)
--- a/citadel/modules/expire/serv_expire.c
+++ b/citadel/modules/expire/serv_expire.c
@@ -530,7 +530,8 @@ int PurgeUsers(void) {
                        ForEachUser(do_uid_user_purge, NULL);
                        break;
                default:
-                       CtdlLogPrintf(CTDL_DEBUG, "Unknown authentication mode!\n");
+                       CtdlLogPrintf(CTDL_DEBUG, "User purge for auth mode %d is not implemented.\n",
+                               config.c_auth_mode);
                        break;
        }
 

diff --git a/citadel/modules/ldap/serv_ldap.c b/citadel/modules/ldap/serv_ldap.c
index ea84e6cdd7f5d72c88f6adda171f26b2d79edc6a..a7551dcbfecd1efcdb4c785ffc5980e13c6b1a6f 100644 (file)
--- a/citadel/modules/ldap/serv_ldap.c
+++ b/citadel/modules/ldap/serv_ldap.c
@@ -107,6 +107,16 @@ int connect_to_ldap(void)
                             "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);