[29184] in CVS-changelog-for-Kerberos-V5
krb5 commit: Correctly use k5_wrapmsg() in ldap_principal2.c
daemon@ATHENA.MIT.EDU (Tom Yu)
Wed Dec 9 18:13:31 2015
Date: Wed, 9 Dec 2015 18:13:26 -0500
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201512092313.tB9NDQsN015201@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/412c19f93a0d7fed853388194f55eaf0d778b9e6
commit 412c19f93a0d7fed853388194f55eaf0d778b9e6
Author: Tom Yu <tlyu@mit.edu>
Date: Wed Dec 9 13:49:22 2015 -0500
Correctly use k5_wrapmsg() in ldap_principal2.c
Commit ebcdf02f8ec212555b1762007fa8454615900f36 incorrectly used
k5_prependmsg() in an error handling clause in
krb5_ldap_get_principal(). Use k5_wrapmsg() instead.
ticket: 8301
target_version: 1.14-next
tags: pullup
src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
index 99d06c5..5def4b7 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
@@ -684,8 +684,8 @@ krb5_ldap_put_principal(krb5_context context, krb5_db_entry *entry,
if (st == KRB5_KDB_NOENTRY || st == KRB5_KDB_CONSTRAINT_VIOLATION) {
int ost = st;
st = EINVAL;
- k5_prependmsg(context, ost, st, _("'%s' not found"),
- xargs.containerdn);
+ k5_wrapmsg(context, ost, st, _("'%s' not found"),
+ xargs.containerdn);
}
goto cleanup;
}
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
