]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Fix omitted variable changes from previous
authorTom Yu <tlyu@mit.edu>
Fri, 1 Jun 2012 23:57:41 +0000 (19:57 -0400)
committerTom Yu <tlyu@mit.edu>
Sat, 2 Jun 2012 00:04:20 +0000 (20:04 -0400)
Some changes of hist_keyblock to hist_keyblocks did not make it into
the previous commit due to merge conflicts.

ticket: 7156
status: resolved

src/lib/kadm5/srv/svr_principal.c

index 1f7e2b38c0f2e2275c60dc96f984418636fda805..ba76b5d8ec4294e11f64aea58ebe2f332e25c36e 100644 (file)
@@ -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)