svn rev #25148: trunk/src/kadmin/dbutil/

[raeburn@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=25148
Commit By: raeburn
Log Message:
ticket: 6617

Instead of passing a 0 to add_new_mkey for kvno and leaving
new_mkey_kvno (used when stashing) uninitialized, use get_next_kvno to
set the latter to the only non-zero value that add_new_mkey will
accept.


Changed Files:
U   trunk/src/kadmin/dbutil/kdb5_mkey.c
Modified: trunk/src/kadmin/dbutil/kdb5_mkey.c
===================================================================
--- trunk/src/kadmin/dbutil/kdb5_mkey.c	2011-09-05 01:22:03 UTC (rev 25147)
+++ trunk/src/kadmin/dbutil/kdb5_mkey.c	2011-09-05 01:58:48 UTC (rev 25148)
@@ -299,7 +299,9 @@
         goto cleanup_return;
     }
 
-    retval = add_new_mkey(util_context, master_entry, &new_mkeyblock, 0);
+    new_mkey_kvno = get_next_kvno(util_context, master_entry);
+    retval = add_new_mkey(util_context, master_entry, &new_mkeyblock,
+                          new_mkey_kvno);
     if (retval) {
         com_err(progname, retval,
                 _("adding new master key to master principal"));