* 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

diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog
index 248179e6ab91affa27eaf25aeff88d3ada7d519b..238fc8fcb6ee6f95e53301c1c61d30b3f3af4d8b 100644 (file)
--- 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 4323d63190777f4fde6fe69c63f007999e97574f..d7118fa7ccb08b75d62e09b6f0473ef0c81cb498 100644 (file)
--- 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 a9d5ba35b2636bd50db9d1e941229dff52397d90..ee45723a47b971cbeb203c379316bbc7533bda76 100644 (file)
--- 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;
     }