From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 4 Feb 2016 22:36:16 +0000 (-0500)
Subject: Fix populate_krb5_db_entry() princ_ent init
X-Git-Tag: krb5-1.15-beta1~276
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9526953f36b39323ec07448a5f218d27c6f1c76f;p=thirdparty%2Fkrb5.git

Fix populate_krb5_db_entry() princ_ent init

The most recent commit introduced a new variable princ_ent in
populate_krb5_db_entry().  princ_ent is cleaned up by the function's
cleanup label, so it must be initialized before any "goto cleanup"
statements.

ticket: 5889
---

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
index 96565c8bd4..7ba44167da 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
@@ -1352,6 +1352,8 @@ populate_krb5_db_entry(krb5_context context, krb5_ldap_context *ldap_context,
     krb5_tl_data userinfo_tl_data = { NULL }, **endp, *tl;
     osa_princ_ent_rec princ_ent;
 
+    memset(&princ_ent, 0, sizeof(princ_ent));
+
     ret = krb5_copy_principal(context, princ, &entry->princ);
     if (ret)
         goto cleanup;
@@ -1458,8 +1460,6 @@ populate_krb5_db_entry(krb5_context context, krb5_ldap_context *ldap_context,
             goto cleanup;
     }
 
-    memset(&princ_ent, 0, sizeof(osa_princ_ent_rec));
-
     ret = krb5_ldap_get_string(ld, ent, "krbpwdpolicyreference", &pwdpolicydn,
                                &attr_present);
     if (ret)