krb5 commit: Correctly use k5_wrapmsg() in ldap_principal2.c

Tom Yu tlyu at mit.edu
Wed Dec 9 18:13:26 EST 2015


https://github.com/krb5/krb5/commit/412c19f93a0d7fed853388194f55eaf0d778b9e6
commit 412c19f93a0d7fed853388194f55eaf0d778b9e6
Author: Tom Yu <tlyu at 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;
             }


More information about the cvs-krb5 mailing list