pull up r20094 from trunk

 r20094@cathode-dark-space:  tlyu | 2007-10-04 18:13:13 -0400
 ticket: 4136
 target_version: 1.6.3
 tags: pullup

 Will Fiveash and Mark Phalan report that kadmin's unlock command calls
 kadm5_lock() instead of of kadm5_unlock().  Apply the obvious fix.

ticket: 4136
version_fixed: 1.6.3

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@20095 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c
index 3603df6692bb5a6ae49dd629fa7966c05393a0f4..ba0bd456b665536d210911f5a9c82732c3ae53c1 100644 (file)
--- a/src/kadmin/cli/kadmin.c
+++ b/src/kadmin/cli/kadmin.c
@@ -603,7 +603,7 @@ void kadmin_unlock(argc, argv)
 
     if (!locked)
        return;
-    retval = kadm5_lock(handle);
+    retval = kadm5_unlock(handle);
     if (retval) {
        com_err("unlock", retval, "");
        return;