From f2cc9c8d33e50b52554a2df8148d4bf7c92fc89a Mon Sep 17 00:00:00 2001 From: Martin Kosek Date: Thu, 2 Feb 2012 11:55:14 +0100 Subject: Improve password change error message User always receives the same error message if he changes his password via "ipa passwd" command and the new password fails configured password policy. He then has to investigate on his own the actual reason why was the policy violated. This patch improves our SLAPI PWD plugins to provide a better error message explaining the violation reason. https://fedorahosted.org/freeipa/ticket/2067 --- daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c | 2 +- daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_prepost.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'daemons/ipa-slapi-plugins') diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c index 82acc49d..f9cff70c 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c @@ -461,7 +461,7 @@ parse_req_done: /* check the policy */ ret = ipapwd_CheckPolicy(&pwdata); if (ret) { - errMesg = "Password Fails to meet minimum strength criteria"; + errMesg = ipapwd_error2string(ret); if (ret == IPAPWD_POLICY_ERROR) { errMesg = "Internal error"; rc = ret; diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_prepost.c b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_prepost.c index a4663c0c..410c536a 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_prepost.c +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd_prepost.c @@ -302,7 +302,7 @@ static int ipapwd_pre_add(Slapi_PBlock *pb) ret = ipapwd_CheckPolicy(&pwdop->pwdata); if (ret) { - errMesg = "Password Fails to meet minimum strength criteria"; + errMesg = ipapwd_error2string(ret); rc = LDAP_CONSTRAINT_VIOLATION; goto done; } @@ -750,7 +750,7 @@ static int ipapwd_pre_mod(Slapi_PBlock *pb) if (has_krb_keys == 0) { ret = ipapwd_CheckPolicy(&pwdop->pwdata); if (ret) { - errMesg = "Password Fails to meet minimum strength criteria"; + errMesg = ipapwd_error2string(ret); rc = LDAP_CONSTRAINT_VIOLATION; goto done; } -- cgit