Fix setting wrrong custom mode on file and in config.

Florian Zschocke

2013-08-20 8b5730a0e32d5707b6ac6df5fb0906b7981853eb

 src/main/java/com/gitblit/LdapUserService.java

@@ -129,7 +129,7 @@
                                logger.debug("detecting removed LDAP users...");



                                for (UserModel userModel : super.getAllUsers()) {

                                    if (ExternalAccount.equals(userModel.password)) {

                                    if (Constants.EXTERNAL_ACCOUNT.equals(userModel.password)) {

                                        if (! ldapUsers.containsKey(userModel.username)) {

                                            logger.info("deleting removed LDAP user " + userModel.username + " from backing user service");

                                            super.deleteUser(userModel.username);

@@ -170,13 +170,24 @@
            if (ldapPort == -1)   // Default Port

               ldapPort = 636;

            

            SSLUtil sslUtil = new SSLUtil(new TrustAllTrustManager()); 
            return new LDAPConnection(sslUtil.createSSLSocketFactory(), ldapUrl.getHost(), ldapPort, bindUserName, bindPassword);

            LDAPConnection conn;

            SSLUtil sslUtil = new SSLUtil(new TrustAllTrustManager());

            if (StringUtils.isEmpty(bindUserName) && StringUtils.isEmpty(bindPassword)) {

                conn = new LDAPConnection(sslUtil.createSSLSocketFactory(), ldapUrl.getHost(), ldapPort);

            } else {

                conn = new LDAPConnection(sslUtil.createSSLSocketFactory(), ldapUrl.getHost(), ldapPort, bindUserName, bindPassword);

            }

            return conn;

         } else {

            if (ldapPort == -1)   // Default Port

               ldapPort = 389;

				
            LDAPConnection conn = new LDAPConnection(ldapUrl.getHost(), ldapPort, bindUserName, bindPassword);



            LDAPConnection conn;

            if (StringUtils.isEmpty(bindUserName) && StringUtils.isEmpty(bindPassword)) {

               conn = new LDAPConnection(ldapUrl.getHost(), ldapPort);	
            } else {

               conn = new LDAPConnection(ldapUrl.getHost(), ldapPort, bindUserName, bindPassword);	
            }



            if (ldapUrl.getScheme().equalsIgnoreCase("ldap+tls")) {

               SSLUtil sslUtil = new SSLUtil(new TrustAllTrustManager());

@@ -344,7 +355,7 @@
      setAdminAttribute(user);

      

      // Don't want visibility into the real password, make up a dummy

      user.password = ExternalAccount;

      user.password = Constants.EXTERNAL_ACCOUNT;

      user.accountType = getAccountType();

      

      // Get full name Attribute