IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove ipa-pwd-extop and ipa-enrollment duplicate error strings

Browse Source 
Some error strings were duplicate which makes it then harder to
see what is the real root cause of it.

https://fedorahosted.org/freeipa/ticket/3988
This commit is contained in:
Martin Kosek
2013-10-29 17:19:28 +01:00
parent e3d56597cd
commit 21137ab63c
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c
View File

@@ -184,7 +184,7 @@ ipa_join(Slapi_PBlock *pb)
slapi_pblock_get(pbte, SLAPI_PLUGIN_INTOP_RESULT, &res); slapi_pblock_get(pbte, SLAPI_PLUGIN_INTOP_RESULT, &res);
if (ret == -1 || res != LDAP_SUCCESS) { if (ret == -1 || res != LDAP_SUCCESS) {
LOG_TRACE("Search for host failed, err (%d)\n", res?res:ret); LOG_TRACE("Search for host failed, err (%d)\n", res?res:ret);
errMesg = "Host not found.\n"; errMesg = "Host not found (search failed).\n";
rc = LDAP_NO_SUCH_OBJECT; rc = LDAP_NO_SUCH_OBJECT;
goto free_and_return; goto free_and_return;
} }
@@ -193,7 +193,7 @@ ipa_join(Slapi_PBlock *pb)
slapi_pblock_get(pbte, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &es); slapi_pblock_get(pbte, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &es);
if (!es) { if (!es) {
LOG_TRACE("No entries ?!"); LOG_TRACE("No entries ?!");
errMesg = "Host not found.\n"; errMesg = "Host not found (no result returned).\n";
rc = LDAP_NO_SUCH_OBJECT; rc = LDAP_NO_SUCH_OBJECT;
goto free_and_return; goto free_and_return;
} }
@@ -204,7 +204,10 @@ ipa_join(Slapi_PBlock *pb)
/* if there is none or more than one, freak out */ /* if there is none or more than one, freak out */
if (i != 1) { if (i != 1) {
LOG_TRACE("Too many entries, or entry no found (%d)", i); LOG_TRACE("Too many entries, or entry no found (%d)", i);
errMesg = "Host not found.\n"; if (i == 0)
errMesg = "Host not found.\n";
else
errMesg = "Host not found (too many entries).\n";
rc = LDAP_NO_SUCH_OBJECT; rc = LDAP_NO_SUCH_OBJECT;
goto free_and_return; goto free_and_return;
} }

19
daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
View File

@@ -719,7 +719,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg)
bsdn = slapi_be_getsuffix(be, 0); bsdn = slapi_be_getsuffix(be, 0);
if (bsdn == NULL) { if (bsdn == NULL) {
LOG_TRACE("Search for Base DN failed\n"); LOG_TRACE("Search for Base DN failed\n");
errMesg = "PrincipalName not found.\n"; errMesg = "PrincipalName not found (search for Base DN failed).\n";
rc = LDAP_NO_SUCH_OBJECT; rc = LDAP_NO_SUCH_OBJECT;
goto free_and_return; goto free_and_return;
} }
@@ -743,7 +743,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg)
if (ret == -1 || res != LDAP_SUCCESS) { if (ret == -1 || res != LDAP_SUCCESS) {
LOG_TRACE("Search for Principal failed, err (%d)\n", LOG_TRACE("Search for Principal failed, err (%d)\n",
res ? res : ret); res ? res : ret);
errMesg = "PrincipalName not found.\n"; errMesg = "PrincipalName not found (search failed).\n";
rc = LDAP_NO_SUCH_OBJECT; rc = LDAP_NO_SUCH_OBJECT;
goto free_and_return; goto free_and_return;
} }
@@ -752,7 +752,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg)
slapi_pblock_get(pbte, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &es); slapi_pblock_get(pbte, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &es);
if (!es) { if (!es) {
LOG_TRACE("No entries ?!"); LOG_TRACE("No entries ?!");
errMesg = "PrincipalName not found.\n"; errMesg = "PrincipalName not found (no result returned).\n";
rc = LDAP_NO_SUCH_OBJECT; rc = LDAP_NO_SUCH_OBJECT;
goto free_and_return; goto free_and_return;
} }
@@ -763,7 +763,10 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg)
/* if there is none or more than one, freak out */ /* if there is none or more than one, freak out */
if (i != 1) { if (i != 1) {
LOG_TRACE("Too many entries, or entry no found (%d)", i); LOG_TRACE("Too many entries, or entry no found (%d)", i);
errMesg = "PrincipalName not found.\n"; if (i == 0)
errMesg = "PrincipalName not found.\n";
else
errMesg = "PrincipalName not found (too many entries).\n";
rc = LDAP_NO_SUCH_OBJECT; rc = LDAP_NO_SUCH_OBJECT;
goto free_and_return; goto free_and_return;
} }
@@ -857,7 +860,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg)
rtag = ber_scanf(ber, "{t[{t[i]t[o]}]", &ttmp, &ttmp, &tint, &ttmp, &tval); rtag = ber_scanf(ber, "{t[{t[i]t[o]}]", &ttmp, &ttmp, &tint, &ttmp, &tval);
if (rtag == LBER_ERROR) { if (rtag == LBER_ERROR) {
LOG_FATAL("ber_scanf failed\n"); LOG_FATAL("ber_scanf failed\n");
errMesg = "Invalid payload, failed to decode.\n"; errMesg = "Invalid payload, failed to decode EncryptionKey.\n";
rc = LDAP_PROTOCOL_ERROR; rc = LDAP_PROTOCOL_ERROR;
goto free_and_return; goto free_and_return;
} }
@@ -906,7 +909,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg)
rtag = ber_scanf(ber, "t[{t[i]", &ttmp, &ttmp, &tint); rtag = ber_scanf(ber, "t[{t[i]", &ttmp, &ttmp, &tint);
if (rtag == LBER_ERROR) { if (rtag == LBER_ERROR) {
LOG_FATAL("ber_scanf failed\n"); LOG_FATAL("ber_scanf failed\n");
errMesg = "Invalid payload, failed to decode.\n"; errMesg = "Invalid payload, failed to decode KrbSalt type.\n";
rc = LDAP_PROTOCOL_ERROR; rc = LDAP_PROTOCOL_ERROR;
goto free_and_return; goto free_and_return;
} }
@@ -920,7 +923,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg)
rtag = ber_scanf(ber, "t[o]}]", &ttmp, &tval); rtag = ber_scanf(ber, "t[o]}]", &ttmp, &tval);
if (rtag == LBER_ERROR) { if (rtag == LBER_ERROR) {
LOG_FATAL("ber_scanf failed\n"); LOG_FATAL("ber_scanf failed\n");
errMesg = "Invalid payload, failed to decode.\n"; errMesg = "Invalid payload, failed to decode KrbSalt contents.\n";
rc = LDAP_PROTOCOL_ERROR; rc = LDAP_PROTOCOL_ERROR;
goto free_and_return; goto free_and_return;
} }
@@ -948,7 +951,7 @@ static int ipapwd_setkeytab(Slapi_PBlock *pb, struct ipapwd_krbcfg *krbcfg)
} }
if (rtag == LBER_ERROR) { if (rtag == LBER_ERROR) {
LOG_FATAL("ber_scanf failed\n"); LOG_FATAL("ber_scanf failed\n");
errMesg = "Invalid payload, failed to decode.\n"; errMesg = "Invalid payload, failed to decode s2kparams.\n";
rc = LDAP_PROTOCOL_ERROR; rc = LDAP_PROTOCOL_ERROR;
goto free_and_return; goto free_and_return;
} }

10
ipalib/plugins/cert.py
View File

@@ -142,7 +142,8 @@ def get_csr_hostname(csr):
subject = pkcs10.get_subject(request) subject = pkcs10.get_subject(request)
return subject.common_name return subject.common_name
except NSPRError, nsprerr: except NSPRError, nsprerr:
raise errors.CertificateOperationError(error=_('Failure decoding Certificate Signing Request:')) raise errors.CertificateOperationError(
error=_('Failure decoding Certificate Signing Request: %s') % nsprerr)
def get_subjectaltname(csr): def get_subjectaltname(csr):
""" """
@@ -155,7 +156,8 @@ def get_subjectaltname(csr):
return nss.x509_alt_name(extension.value)[0] return nss.x509_alt_name(extension.value)[0]
return None return None
except NSPRError, nsprerr: except NSPRError, nsprerr:
raise errors.CertificateOperationError(error=_('Failure decoding Certificate Signing Request')) raise errors.CertificateOperationError(
error=_('Failure decoding Certificate Signing Request: %s') % nsprerr)
def validate_csr(ugettext, csr): def validate_csr(ugettext, csr):
""" """
@@ -171,10 +173,8 @@ def validate_csr(ugettext, csr):
request = pkcs10.load_certificate_request(csr) request = pkcs10.load_certificate_request(csr)
except TypeError, e: except TypeError, e:
raise errors.Base64DecodeError(reason=str(e)) raise errors.Base64DecodeError(reason=str(e))
except NSPRError:
raise errors.CertificateOperationError(error=_('Failure decoding Certificate Signing Request'))
except Exception, e: except Exception, e:
raise errors.CertificateOperationError(error=_('Failure decoding Certificate Signing Request: %s') % str(e)) raise errors.CertificateOperationError(error=_('Failure decoding Certificate Signing Request: %s') % e)
def normalize_csr(csr): def normalize_csr(csr):
""" """