From: Tom Yu <tlyu@mit.edu>
Date: Fri, 1 Jun 2012 23:57:41 +0000 (-0400)
Subject: Fix omitted variable changes from previous
X-Git-Tag: krb5-1.9.4-final~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b89d4e5b358f320ed5254143d51edfe49060455f;p=thirdparty%2Fkrb5.git

Fix omitted variable changes from previous

Some changes of hist_keyblock to hist_keyblocks did not make it into
the previous commit due to merge conflicts.

ticket: 7156
status: resolved
---

diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c
index 1f7e2b38c0..ba76b5d8ec 100644
--- a/src/lib/kadm5/srv/svr_principal.c
+++ b/src/lib/kadm5/srv/svr_principal.c
@@ -1421,18 +1421,18 @@ kadm5_chpass_principal_3(void *server_handle,
         }
 #endif
 
-        ret = kdb_get_hist_key(handle, &hist_keyblock, &hist_kvno);
+        ret = kdb_get_hist_key(handle, &hist_keyblocks, &hist_kvno);
         if (ret)
             goto done;
 
         ret = create_history_entry(handle->context,
-                                   &hist_keyblock,
+                                   &hist_keyblocks[0],
                                    kdb_save->n_key_data,
                                    kdb_save->key_data, &hist);
         if (ret)
             goto done;
 
-        ret = check_pw_reuse(handle->context, &hist_keyblock,
+        ret = check_pw_reuse(handle->context, hist_keyblocks,
                              kdb->n_key_data, kdb->key_data,
                              1, &hist);
         if (ret)