Two patches from Roland Dowdeswell to make n_keys/new_keys args optional.

lib/kadm5/randkey_c.c

@@ -120,9 +120,11 @@ kadm5_c_randkey_principal(void *server_handle,
 	}
 	for(i = 0; i < tmp; i++)
 	    krb5_ret_keyblock(sp, &k[i]);
+	if (n_keys && new_keys) {
 	    *n_keys = tmp;
 	    *new_keys = k;
 	}
+    }
 out:
     krb5_storage_free(sp);
     krb5_data_free (&reply);

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;
+   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);