diff options
| author | Tom Yu <tlyu@mit.edu> | 2002-11-08 20:10:27 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2002-11-08 20:10:27 +0000 |
| commit | 9a1a0bbc9d9cb2edb16940953f9ca71b2b4e74ed (patch) | |
| tree | fc9beb7d9dac82247ffd3219db8d5a853ac8ee1d | |
| parent | e4e2df71a52a4167061a87b74327b3d0bcffb8d0 (diff) | |
| download | krb5-9a1a0bbc9d9cb2edb16940953f9ca71b2b4e74ed.zip krb5-9a1a0bbc9d9cb2edb16940953f9ca71b2b4e74ed.tar.gz krb5-9a1a0bbc9d9cb2edb16940953f9ca71b2b4e74ed.tar.bz2 | |
pull up from trunk
ticket: 1008
target_version: 1.2.7
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-2-2-branch@14981 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/kadm5/srv/ChangeLog | 8 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/svr_principal.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog index 34d3ff0..6d45fa3 100644 --- a/src/lib/kadm5/srv/ChangeLog +++ b/src/lib/kadm5/srv/ChangeLog @@ -1,3 +1,11 @@ +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. + [pullup from trunk] + 2001-11-05 Tom Yu <tlyu@mit.edu> * Makefile.in (LIBMAJOR): Bump to avoid Heimdal conflict. diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c index 040a8e6..aeae090 100644 --- a/src/lib/kadm5/srv/svr_principal.c +++ b/src/lib/kadm5/srv/svr_principal.c @@ -1517,7 +1517,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))) |