summaryrefslogtreecommitdiffstats
path: root/daemons/ipa-slapi-plugins/ipa-enrollment
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2013-10-29 17:19:28 +0100
committerMartin Kosek <mkosek@redhat.com>2013-10-30 17:59:46 +0100
commit21137ab63c83c8f75823daa9a6f9b5d7885ebe59 (patch)
tree69abc9be3a3e8d008316e1293637d5c71905e8a2 /daemons/ipa-slapi-plugins/ipa-enrollment
parente3d56597cd8aba4eee17a19f326f36bfcb3b90e2 (diff)
downloadfreeipa.git-21137ab63c83c8f75823daa9a6f9b5d7885ebe59.tar.gz
freeipa.git-21137ab63c83c8f75823daa9a6f9b5d7885ebe59.tar.xz
freeipa.git-21137ab63c83c8f75823daa9a6f9b5d7885ebe59.zip
Remove ipa-pwd-extop and ipa-enrollment duplicate error strings
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
Diffstat (limited to 'daemons/ipa-slapi-plugins/ipa-enrollment')
-rw-r--r--daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c b/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c
index 22c40f2b..a3dcf08a 100644
--- a/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c
+++ b/daemons/ipa-slapi-plugins/ipa-enrollment/ipa_enrollment.c
@@ -184,7 +184,7 @@ ipa_join(Slapi_PBlock *pb)
slapi_pblock_get(pbte, SLAPI_PLUGIN_INTOP_RESULT, &res);
if (ret == -1 || res != LDAP_SUCCESS) {
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;
goto free_and_return;
}
@@ -193,7 +193,7 @@ ipa_join(Slapi_PBlock *pb)
slapi_pblock_get(pbte, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, &es);
if (!es) {
LOG_TRACE("No entries ?!");
- errMesg = "Host not found.\n";
+ errMesg = "Host not found (no result returned).\n";
rc = LDAP_NO_SUCH_OBJECT;
goto free_and_return;
}
@@ -204,7 +204,10 @@ ipa_join(Slapi_PBlock *pb)
/* if there is none or more than one, freak out */
if (i != 1) {
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;
goto free_and_return;
}