Thanks, patch applied

	* svr_principal.c (kadm5_setkey_principal_3): Apply patch from
	Emily Ratliff to allow n_ks_tuple to be zero, which is the case if
	being called from kadmind answering a client's setkey_principal
	request.

ticket: 1008
target_version: 1.3

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14978 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog
index c9941e7343f0c2617e7077a5538cc997c5905291..919ad1fbc30da9b7278fa16081712d2c1f0b99f2 100644 (file)
--- a/src/lib/kadm5/srv/ChangeLog
+++ b/src/lib/kadm5/srv/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-07  Tom Yu  <tlyu@mit.edu>
+
+       * svr_principal.c (kadm5_setkey_principal_3): Apply patch from
+       Emily Ratliff to allow n_ks_tuple to be zero, which is the case if
+       being called from kadmind answering a client's setkey_principal
+       request.
+
 2002-10-15  Ezra Peisach  <epeisach@bu.edu>
 
        * server_init.c (kadm5_lock, kadm5_unlock): Return KADM5_OK

diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c
index 1586bc5b4ca922e07ba61c204667e7b56392bebc..c1b8bc59c9c4ef014935982a411ff458214167d4 100644 (file)
--- a/src/lib/kadm5/srv/svr_principal.c
+++ b/src/lib/kadm5/srv/svr_principal.c
@@ -1546,7 +1546,7 @@ kadm5_setkey_principal_3(void *server_handle,
        }
     }
 
-    if (n_ks_tuple != n_keys)
+    if (n_ks_tuple && n_ks_tuple != n_keys)
        return KADM5_SETKEY3_ETYPE_MISMATCH;
 
     if ((ret = kdb_get_entry(handle, principal, &kdb, &adb)))