RANGER-3825: Ranger admin user is unable to change another user email after the upgrade

Author: pradeepagrawal8184

security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java

@@ -530,17 +530,17 @@ public VXPortalUser changeEmailAddress(XXPortalUser gjUser,
 												MessageEnums.OPER_NO_PERMISSION, null, null, ""
 														+ changeEmail);
 					}
-			} else {
-				String encryptedOldPwd = encrypt(gjUser.getLoginId(), changeEmail.getOldPassword());
+		} else {
+			String encryptedOldPwd = encrypt(gjUser.getLoginId(), changeEmail.getOldPassword());
+			if (!stringUtil.equals(encryptedOldPwd, gjUser.getPassword())) {
+				encryptedOldPwd = encryptWithOlderAlgo(gjUser.getLoginId(), changeEmail.getOldPassword());
 				if (!stringUtil.equals(encryptedOldPwd, gjUser.getPassword())) {
-					logger.info("changeEmailAddress(). Invalid  password. changeEmail="
-							+ changeEmail);
-					throw restErrorUtil.createRESTException(
-							"serverMsg.userMgrWrongPassword",
-							MessageEnums.OPER_NO_PERMISSION, null, null, ""
-									+ changeEmail);
+					logger.info("changeEmailAddress(). Invalid  password. changeEmail=" + changeEmail);
+					throw restErrorUtil.createRESTException("serverMsg.userMgrWrongPassword",
+							MessageEnums.OPER_NO_PERMISSION, null, null, "" + changeEmail);
 				}
 			}
+		}
 
 		// Normalize email. Make it lower case
 		gjUser.setEmailAddress(stringUtil.normalizeEmail(changeEmail