diff options
| author | Tom Yu <tlyu@mit.edu> | 1997-07-01 06:34:18 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1997-07-01 06:34:18 +0000 |
| commit | dc3b68906b5f12d7379082777dd5d30b251b6fc9 (patch) | |
| tree | dfed947a11bf6b3bb49f7f4f4d03f0d90a9d0010 | |
| parent | 6346c7b459f8d1c57b5b84be3570a6824989835c (diff) | |
| download | krb5-dc3b68906b5f12d7379082777dd5d30b251b6fc9.tar.gz krb5-dc3b68906b5f12d7379082777dd5d30b251b6fc9.tar.xz krb5-dc3b68906b5f12d7379082777dd5d30b251b6fc9.zip | |
* server_acl.h: Fix ACL_ALL_MASK to include ACL_SETKEY
* svr_principal.c: Fix setv4key_principal.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10108 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/kadm5/srv/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/server_acl.h | 3 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/svr_principal.c | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog index 248179e6ab..238fc8fcb6 100644 --- a/src/lib/kadm5/srv/ChangeLog +++ b/src/lib/kadm5/srv/ChangeLog @@ -1,3 +1,9 @@ +Tue Jul 1 02:32:49 1997 Tom Yu <tlyu@mit.edu> + + * server_acl.h: Fix ACL_ALL_MASK to include ACL_SETKEY. + + * svr_principal.c: Fix setv4key_principal. + Sun Jun 29 14:52:51 1997 Tom Yu <tlyu@mit.edu> * svr_principal.c: Add new function kadm5_setv4key_principal. diff --git a/src/lib/kadm5/srv/server_acl.h b/src/lib/kadm5/srv/server_acl.h index 4323d63190..d7118fa7cc 100644 --- a/src/lib/kadm5/srv/server_acl.h +++ b/src/lib/kadm5/srv/server_acl.h @@ -64,7 +64,8 @@ ACL_MODIFY | \ ACL_CHANGEPW | \ ACL_INQUIRE | \ - ACL_LIST) + ACL_LIST | \ + ACL_SETKEY) krb5_error_code acl_init KRB5_PROTOTYPE((krb5_context, diff --git a/src/lib/kadm5/srv/svr_principal.c b/src/lib/kadm5/srv/svr_principal.c index a9d5ba35b2..ee45723a47 100644 --- a/src/lib/kadm5/srv/svr_principal.c +++ b/src/lib/kadm5/srv/svr_principal.c @@ -1319,7 +1319,7 @@ kadm5_setv4key_principal(void *server_handle, &master_encblock, keyblock, &keysalt, kvno + 1, - &kdb.key_data[i])) { + kdb.key_data)) { goto done; } |