* Added a separate authentication mode AUTHMODE_LDAP_AD for Active Directory's nonsta...

[citadel.git] / citadel / setup.c

diff --git a/citadel/setup.c b/citadel/setup.c
index 3eb585e7c56a694a9f9bd9a26a60f77434a8f063..e72c6d476ff6df4b9116dc60599ae2b06ad04d58 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -144,18 +144,30 @@ char *setup_text[] = {
 "\n"
 " 1. Authenticate users against the host system (unix or linux accounts)\n"
 "\n"
-" 2. Authenticate users against an external LDAP directory\n"
+" 2. Authenticate users against an external LDAP directory (RFC 2307 compliant)\n"
+"\n"
+" 3. Authenticate users against nonstandard MS Active Directory LDAP\n"
 "\n"
 "WARNING: do *not* change this setting once your system is installed.\n"
 "\n"
 "(Answer \"0\" unless you completely understand this option)\n"
 "Which authentication mode do you want to use?\n",
 
-       "LDAP host FIXME\n",
-       "LDAP port number FIXME\n",
-       "LDAP base DN FIXME\n",
-       "LDAP bind DN FIXME\n",
-       "LDAP bind password FIXME\n"
+"Please enter the host name or IP address of your LDAP server.\n",
+
+"Please enter the port number of the LDAP service (usually 389).\n",
+
+"Please enter the Base DN to search for authentication\n"
+"(for example: dc=example,dc=com)\n",
+
+"Please enter the DN of an account to use for binding to the LDAP server\n"
+"for performing queries.  The account does not require any other\n"
+"privileges.  If your LDAP server allows anonymous queries, you can.\n"
+"leave this blank.\n",
+
+"If you entered a Bind DN in the previous question, you must now enter\n"
+"the password associated with that account.  Otherwise, you can leave this\n"
+"blank.\n"
 
 };
 
@@ -1299,7 +1311,9 @@ int main(int argc, char *argv[])
        /* Go through a series of dialogs prompting for config info */
        for (curr = 1; curr <= MAXSETUP; ++curr) {
                edit_value(curr);
-               if ((curr == 6) && (config.c_auth_mode != AUTHMODE_LDAP)) curr += 5;    /* skip LDAP questions */
+               if ((curr == 6) && (config.c_auth_mode != AUTHMODE_LDAP) && (config.c_auth_mode != AUTHMODE_LDAP_AD)) {
+                       curr += 5;      /* skip LDAP questions if we're not authenticating against LDAP */
+               }
        }
 
 /***** begin version update section ***** */