Logic tweaks.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5555 b35dd754-fafc-0310-a699-88a17e54d16e

src/web/setup/setup-ldap-server.jsp

@@ -77,11 +77,9 @@
                     Boolean.toString(connectionPoolEnabled));
             JiveGlobals.setXMLProperty("ldap.sslEnabled", Boolean.toString(sslEnabled));
             JiveGlobals.setXMLProperty("ldap.debugEnabled", Boolean.toString(debugEnabled));
-            JiveGlobals
-                    .setXMLProperty("ldap.autoFollowReferrals", Boolean.toString(referralsEnabled));
-            // Enable the LDAP auth provider. The LDAP user provider will be enabled on the next step.
-            JiveGlobals.setXMLProperty("provider.auth.className",
-                    "org.jivesoftware.wildfire.ldap.LdapAuthProvider");
+            JiveGlobals.setXMLProperty("ldap.autoFollowReferrals",
+                    Boolean.toString(referralsEnabled));
+
             // Redirect to next step.
             response.sendRedirect("setup-ldap-user.jsp?serverType=" + serverType);
             return;

src/web/setup/setup-ldap-user.jsp

@@ -62,9 +62,11 @@
             JiveGlobals.setXMLProperty("ldap.searchFields", searchFields);
             JiveGlobals.setXMLProperty("ldap.searchFilter", searchFilter);
 
-            // Enable the LDAP auth provider. The LDAP user provider will be enabled on the next step.
+            // Enable the LDAP auth and user providers. The group provider will be enabled on the next step.
             JiveGlobals.setXMLProperty("provider.user.className",
                     "org.jivesoftware.wildfire.ldap.LdapUserProvider");
+            JiveGlobals.setXMLProperty("provider.auth.className",
+                    "org.jivesoftware.wildfire.ldap.LdapAuthProvider");
 
             // Redirect
             response.sendRedirect("setup-ldap-group.jsp?serverType=" + serverType);