[26589] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.9]: Fix omitted variable changes from previous
daemon@ATHENA.MIT.EDU (Tom Yu)
Fri Jun 1 20:08:35 2012
Date: Fri, 1 Jun 2012 20:08:29 -0400
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201206020008.q5208Tk6000957@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/b89d4e5b358f320ed5254143d51edfe49060455f
commit b89d4e5b358f320ed5254143d51edfe49060455f
Author: Tom Yu <tlyu@mit.edu>
Date: Fri Jun 1 19:57:41 2012 -0400
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
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)
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
