Merge pull request #7030 from pmb0/ldap-fallback-pw-store

[FIX] do only store password if LDAP_Login_Fallback is on
RocketChat · May 31, 2017 · b20cff2 · b20cff2
2 parents a3e88a1 + 8a23424
commit b20cff2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/rocketchat-ldap/server/loginHandler.js b/packages/rocketchat-ldap/server/loginHandler.js
@@ -125,7 +125,11 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
 		});
 
 		syncUserData(user, ldapUser);
-		Accounts.setPassword(user._id, loginRequest.ldapPass, {logout: false});
+
+		if (RocketChat.settings.get('LDAP_Login_Fallback') === true) {
+			Accounts.setPassword(user._id, loginRequest.ldapPass, {logout: false});
+		}
+
 		return {
 			userId: user._id,
 			token: stampedToken.token