From 4f5dbf2f81e674449c2486cd535d9ce58dffcb7a Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@cryptonector.com>
Date: Wed, 20 Jul 2011 18:54:29 -0500
Subject: [PATCH] Two patches from Roland Dowdeswell to make n_keys/new_keys
 args optional.

---
 lib/kadm5/randkey_c.c | 6 ++++--
 lib/kadm5/set_keys.c  | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/kadm5/randkey_c.c b/lib/kadm5/randkey_c.c
index 3626d3fbd..8f1688377 100644
--- a/lib/kadm5/randkey_c.c
+++ b/lib/kadm5/randkey_c.c
@@ -120,8 +120,10 @@ kadm5_c_randkey_principal(void *server_handle,
 	}
 	for(i = 0; i < tmp; i++)
 	    krb5_ret_keyblock(sp, &k[i]);
-	*n_keys = tmp;
-	*new_keys = k;
+	if (n_keys && new_keys) {
+	    *n_keys = tmp;
+	    *new_keys = k;
+	}
     }
 out:
     krb5_storage_free(sp);
diff --git a/lib/kadm5/set_keys.c b/lib/kadm5/set_keys.c
index 011fbfb1e..164f3fb78 100644
--- a/lib/kadm5/set_keys.c
+++ b/lib/kadm5/set_keys.c
@@ -309,8 +309,10 @@ out:
    _kadm5_free_keys (context->context, ent->keys.len, ent->keys.val);
    ent->keys.val = keys;
    ent->keys.len = num_keys;
-   *new_keys     = kblock;
-   *n_keys       = num_keys;
+   if (n_keys && new_keys) {
+       *new_keys     = kblock;
+       *n_keys       = num_keys;
+   }
 
    hdb_entry_set_pw_change_time(context->context, ent, 0);
    hdb_entry_clear_password(context->context, ent);