81 lines
3.3 KiB
Diff
81 lines
3.3 KiB
Diff
|
From d17df6f22376753b5cd156f1b7f51837cae1f522 Mon Sep 17 00:00:00 2001
|
||
|
|
From: jmagne <jmagne@redhat.com>
|
||
|
|
Date: Mon, 22 Feb 2021 13:44:20 -0800
|
||
|
|
Subject: [PATCH] pkispawn fails against 389-ds 1.4.3.19 #3458 (#3465)
|
||
|
|
|
||
|
|
Add suggested patch from stanislavlevin to solve this issue.
|
||
|
|
Also add f34 to the ipa tests,this time really add the tests.
|
||
|
|
Upon further review, back out of f34 tests until the infractructure
|
||
|
|
supports it.
|
||
|
|
|
||
|
|
Also hardcode tomcat app setting in spec file for the moment to
|
||
|
|
avoid possible glitches on certain platform.
|
||
|
|
|
||
|
|
Co-authored-by: Jack Magne <jmagne@localhost.localdomain>
|
||
|
|
---
|
||
|
|
.../com/netscape/cmscore/apps/CMSEngine.java | 18 +++++++-----------
|
||
|
|
1 file changed, 7 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/base/server/src/com/netscape/cmscore/apps/CMSEngine.java b/base/server/src/com/netscape/cmscore/apps/CMSEngine.java
|
||
|
|
index 295c4d4cc..f40f99136 100644
|
||
|
|
--- a/base/server/src/com/netscape/cmscore/apps/CMSEngine.java
|
||
|
|
+++ b/base/server/src/com/netscape/cmscore/apps/CMSEngine.java
|
||
|
|
@@ -156,9 +156,8 @@ public class CMSEngine {
|
||
|
|
|
||
|
|
private static final int PW_OK =0;
|
||
|
|
//private static final int PW_BAD_SETUP = 1;
|
||
|
|
- private static final int PW_INVALID_PASSWORD = 2;
|
||
|
|
+ private static final int PW_INVALID_CREDENTIALS = 2;
|
||
|
|
private static final int PW_CANNOT_CONNECT = 3;
|
||
|
|
- private static final int PW_NO_USER = 4;
|
||
|
|
private static final int PW_MAX_ATTEMPTS = 3;
|
||
|
|
|
||
|
|
|
||
|
|
@@ -332,16 +331,16 @@ public class CMSEngine {
|
||
|
|
}
|
||
|
|
|
||
|
|
int iteration = 0;
|
||
|
|
- int result = PW_INVALID_PASSWORD;
|
||
|
|
+ int result = PW_INVALID_CREDENTIALS;
|
||
|
|
|
||
|
|
do {
|
||
|
|
String passwd = mPasswordStore.getPassword(tag, iteration);
|
||
|
|
result = testLDAPConnection(tag, connInfo, binddn, passwd);
|
||
|
|
iteration++;
|
||
|
|
- } while ((result == PW_INVALID_PASSWORD) && (iteration < PW_MAX_ATTEMPTS));
|
||
|
|
+ } while ((result == PW_INVALID_CREDENTIALS) && (iteration < PW_MAX_ATTEMPTS));
|
||
|
|
|
||
|
|
if (result != PW_OK) {
|
||
|
|
- if ((result == PW_NO_USER) && (tag.equals("replicationdb"))) {
|
||
|
|
+ if ((result == PW_INVALID_CREDENTIALS) && (tag.equals("replicationdb"))) {
|
||
|
|
logger.warn(
|
||
|
|
"CMSEngine: password test execution failed for replicationdb " +
|
||
|
|
"with NO_SUCH_USER. This may not be a latest instance. Ignoring ..");
|
||
|
|
@@ -364,7 +363,7 @@ public class CMSEngine {
|
||
|
|
int ret = PW_OK;
|
||
|
|
|
||
|
|
if (StringUtils.isEmpty(pwd)) {
|
||
|
|
- return PW_INVALID_PASSWORD;
|
||
|
|
+ return PW_INVALID_CREDENTIALS;
|
||
|
|
}
|
||
|
|
|
||
|
|
String host = info.getHost();
|
||
|
|
@@ -383,12 +382,9 @@ public class CMSEngine {
|
||
|
|
|
||
|
|
switch (e.getLDAPResultCode()) {
|
||
|
|
case LDAPException.NO_SUCH_OBJECT:
|
||
|
|
- logger.debug("CMSEngine: user does not exist: " + binddn);
|
||
|
|
- ret = PW_NO_USER;
|
||
|
|
- break;
|
||
|
|
case LDAPException.INVALID_CREDENTIALS:
|
||
|
|
- logger.debug("CMSEngine: invalid password");
|
||
|
|
- ret = PW_INVALID_PASSWORD;
|
||
|
|
+ logger.debug("CMSEngine: invalid credentials");
|
||
|
|
+ ret = PW_INVALID_CREDENTIALS;
|
||
|
|
break;
|
||
|
|
default:
|
||
|
|
logger.debug("CMSEngine: unable to connect to " + name + ": " + e.getMessage());
|
||
|
|
--
|
||
|
|
2.29.2
|
||
|
|
|