diff options
| author | Tom Yu <tlyu@mit.edu> | 2012-06-01 19:57:41 -0400 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2012-06-01 20:04:20 -0400 |
| commit | b89d4e5b358f320ed5254143d51edfe49060455f (patch) | |
| tree | 417907452597b2cd1faeba4c76654397e8206149 | |
| parent | cfea6939cb8cb7c89ed265c472ea556100a6c64d (diff) | |
| download | krb5-b89d4e5b358f320ed5254143d51edfe49060455f.zip krb5-b89d4e5b358f320ed5254143d51edfe49060455f.tar.gz krb5-b89d4e5b358f320ed5254143d51edfe49060455f.tar.bz2 | |
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
| -rw-r--r-- | src/lib/kadm5/srv/svr_principal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c index 1f7e2b3..ba76b5d 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) |