From: Tom Yu Date: Thu, 7 Nov 2002 21:40:15 +0000 (+0000) Subject: Thanks, patch applied X-Git-Tag: krb5-1.3-alpha1~286 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=72a5933190206857aa099fe51404560e71148d9f;p=krb5.git 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 c9941e734..919ad1fbc 100644 --- a/src/lib/kadm5/srv/ChangeLog +++ b/src/lib/kadm5/srv/ChangeLog @@ -1,3 +1,10 @@ +2002-11-07 Tom Yu + + * 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 * 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 1586bc5b4..c1b8bc59c 100644 --- 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)))