From ac58dc50f76f1a97dfa368f2a3cbb19825c27f35 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Fri, 30 Jan 2009 18:02:22 +0000
Subject: [PATCH] * serv_ldap.c: upon successful connect to an LDAP server,
 post an aide message warning the site operator that this module is
 deprecated.

---
 citadel/citadel.h                    |  6 +++---
 citadel/modules/expire/serv_expire.c |  3 ++-
 citadel/modules/ldap/serv_ldap.c     | 10 ++++++++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 5b6bb0a69..cbf7cadee 100644
--- 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 2a585e551..d45ca5121 100644
--- 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 ea84e6cdd..a7551dcbf 100644
--- 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);
-- 
2.30.2