In loop over entries, make local vars local to each iteration

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20618 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/kdb/kdb_convert.c b/src/lib/kdb/kdb_convert.c
index 63ddf9f367044e36f817422a145a8f89ef052e83..db0a2c579aeb4175c0e960ad56f264d245912fcc 100644 (file)
--- a/src/lib/kdb/kdb_convert.c
+++ b/src/lib/kdb/kdb_convert.c
@@ -625,19 +625,10 @@ ulog_conv_2dbentry(krb5_context context, krb5_db_entry *entries,
                   kdb_incr_update_t *updates,
                   int nentries)
 {
-    int i, j, k, cnt, mod_time = 0, nattrs, nprincs;
-    krb5_principal mod_princ = NULL;
-    krb5_principal dbprinc;
-    char *dbprincstr = NULL;
-
+    int k;
     krb5_db_entry *ent;
     kdb_incr_update_t *upd;
 
-    krb5_tl_data *newtl = NULL;
-    krb5_error_code ret;
-    unsigned int more;
-    unsigned int prev_n_keys = 0;
-
     if ((updates == NULL) || (entries == NULL))
        return (KRB5KRB_ERR_GENERIC);
 
@@ -645,7 +636,15 @@ ulog_conv_2dbentry(krb5_context context, krb5_db_entry *entries,
     upd = updates;
 
     for (k = 0; k < nentries; k++) {
-       cnt = nprincs = 0;
+       krb5_principal mod_princ = NULL;
+       int i, j, cnt = 0, mod_time = 0, nattrs, nprincs = 0;
+       krb5_principal dbprinc;
+       char *dbprincstr = NULL;
+
+       krb5_tl_data *newtl = NULL;
+       krb5_error_code ret;
+       unsigned int more;
+       unsigned int prev_n_keys = 0;
 
        /*
         * If the ulog entry represents a DELETE update,
@@ -851,6 +850,7 @@ ulog_conv_2dbentry(krb5_context context, krb5_db_entry *entries,
            ret = krb5_dbe_update_mod_princ_data(context, ent,
                                                 mod_time, mod_princ);
            krb5_free_principal(context, mod_princ);
+           mod_princ = NULL;
            if (ret)
                return (ret);
        }