diff options
| author | Tom Yu <tlyu@mit.edu> | 2002-11-07 21:40:15 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2002-11-07 21:40:15 +0000 |
| commit | 72a5933190206857aa099fe51404560e71148d9f (patch) | |
| tree | 0fe9201c9d06765306750505dbb01ece2f638549 /src/lib | |
| parent | 3462b0dc20f1df61b8f4bfdb79e21103a0d0a8ff (diff) | |
| download | krb5-72a5933190206857aa099fe51404560e71148d9f.tar.gz krb5-72a5933190206857aa099fe51404560e71148d9f.tar.xz krb5-72a5933190206857aa099fe51404560e71148d9f.zip | |
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
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/kadm5/srv/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/svr_principal.c | 2 |
2 files changed, 8 insertions, 1 deletions
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 <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 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))) |