From 6471084d4a9167f7a56db3a846cacafd4b3c9779 Mon Sep 17 00:00:00 2001 From: Reyaud Ali Date: Thu, 30 Aug 2018 13:33:51 -0300 Subject: [PATCH] Merged PR 7661: #157799-Enhance password request conflict error Generate a more appropriate password request conflict error message Related work items: #157799 --- domainjoin/libdomainjoin/src/djpbps/pbpsLog.c | 2 +- lwadvapi/include/public/lwerror-table.h | 1 + lwadvapi/include/public/lwerror.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/domainjoin/libdomainjoin/src/djpbps/pbpsLog.c b/domainjoin/libdomainjoin/src/djpbps/pbpsLog.c index e26131240..a8b8f0a58 100644 --- a/domainjoin/libdomainjoin/src/djpbps/pbpsLog.c +++ b/domainjoin/libdomainjoin/src/djpbps/pbpsLog.c @@ -111,7 +111,7 @@ PbpsHttpErrorToLwError(PbpsErrorCode_t pbpsErrorCode) return LW_ERROR_NO_SUCH_OBJECT; case PBPS_HTTP_CONFLICTING_REQUESTS: - return LW_ERROR_NOT_HANDLED; + return LW_ERROR_DOMAINJOIN_PASSWORD_REQUEST_CONFLICT; case PBPS_HTTP_API_VERSION_DISABLED: return LW_ERROR_SERVICE_NOT_AVAILABLE; diff --git a/lwadvapi/include/public/lwerror-table.h b/lwadvapi/include/public/lwerror-table.h index 87f7ec231..c7bf78cb8 100644 --- a/lwadvapi/include/public/lwerror-table.h +++ b/lwadvapi/include/public/lwerror-table.h @@ -410,6 +410,7 @@ S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_DOMAINJOIN_CONFIG_OUT_OF_RANGE, -1, "A S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_DOMAINJOIN_CONFIG_INVALID_CERTIFICATE, -1, "Certificate in domain join configuration file is not valid") S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_DOMAINJOIN_CONFIG_CANT_VERIFY_CERTIFICATE, -1, "Cannot verify PasswordSafe server using certificate in domain join configuration file") S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_DOMAINJOIN_CANNOT_RESOLVE_HOST, -1, "Cannot resolve host") +S ( LW_STATUS_MESSAGE_NOT_FOUND, LW_ERROR_DOMAINJOIN_PASSWORD_REQUEST_CONFLICT, -1, "Conflicting request exists. This user or another user has already requested a password for the specified account") #include "lwerror-table-krb5.h" diff --git a/lwadvapi/include/public/lwerror.h b/lwadvapi/include/public/lwerror.h index fdf3c7032..25aa22264 100644 --- a/lwadvapi/include/public/lwerror.h +++ b/lwadvapi/include/public/lwerror.h @@ -761,6 +761,7 @@ #define LW_ERROR_DOMAINJOIN_CONFIG_INVALID_CERTIFICATE 42519 #define LW_ERROR_DOMAINJOIN_CONFIG_CANT_VERIFY_CERTIFICATE 42520 #define LW_ERROR_DOMAINJOIN_CANNOT_RESOLVE_HOST 42521 +#define LW_ERROR_DOMAINJOIN_PASSWORD_REQUEST_CONFLICT 42522 // Range 42600 - 42560 is reserved for autoenroll #define LW_ERROR_AUTOENROLL_FAILED 42600