From 2f6ad56c46639c7a34ae230d5391e244c314dff7 Mon Sep 17 00:00:00 2001 From: "Roland C. Dowdeswell" Date: Fri, 25 Nov 2011 14:08:26 +0000 Subject: [PATCH] Reverse order of n_ks_tuple and ks_tuple in hdb_generate_key_set(). Signed-off-by: Nicolas Williams --- lib/hdb/keys.c | 4 ++-- lib/kadm5/default_keys.c | 2 +- lib/kadm5/set_keys.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/hdb/keys.c b/lib/hdb/keys.c index ddcc92c7a..8728c54d1 100644 --- a/lib/hdb/keys.c +++ b/lib/hdb/keys.c @@ -476,7 +476,7 @@ out: krb5_error_code hdb_generate_key_set(krb5_context context, krb5_principal principal, - int n_ks_tuple, krb5_key_salt_tuple *ks_tuple, + krb5_key_salt_tuple *ks_tuple, int n_ks_tuple, Key **ret_key_set, size_t *nkeyset, int no_salt) { char **ktypes = NULL; @@ -596,7 +596,7 @@ hdb_generate_key_set_password(krb5_context context, krb5_error_code ret; size_t i; - ret = hdb_generate_key_set(context, principal, 0, NULL, + ret = hdb_generate_key_set(context, principal, NULL, 0, keys, num_keys, 0); if (ret) return ret; diff --git a/lib/kadm5/default_keys.c b/lib/kadm5/default_keys.c index ff643bc11..c3494e5b8 100644 --- a/lib/kadm5/default_keys.c +++ b/lib/kadm5/default_keys.c @@ -85,7 +85,7 @@ parse_file(krb5_context context, krb5_principal principal, int no_salt) size_t nkeys; Key *keys; - ret = hdb_generate_key_set(context, principal, 0, NULL, &keys, &nkeys, + ret = hdb_generate_key_set(context, principal, NULL, 0, &keys, &nkeys, no_salt); if (ret) krb5_err(context, 1, ret, "hdb_generate_key_set"); diff --git a/lib/kadm5/set_keys.c b/lib/kadm5/set_keys.c index a5049a3fa..4669bd507 100644 --- a/lib/kadm5/set_keys.c +++ b/lib/kadm5/set_keys.c @@ -336,7 +336,7 @@ _kadm5_set_keys_randomly (kadm5_server_context *context, Key *keys; ret = hdb_generate_key_set(context->context, ent->principal, - n_ks_tuple, ks_tuple, &keys, &num_keys, 1); + ks_tuple, n_ks_tuple, &keys, &num_keys, 1); if (ret) return ret;