aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2015-03-13 12:45:27 -0400
committerTom Yu <tlyu@mit.edu>2015-05-12 15:41:27 -0400
commit07105895985e4c55a7bbf2bfc8fd23d5b8c95b95 (patch)
tree0f4ee020a01f82995c669c5f15bd8b5e741dd233
parentbab11e7d597635d88bb693c39ffaddfed906b594 (diff)
downloadkrb5-07105895985e4c55a7bbf2bfc8fd23d5b8c95b95.zip
krb5-07105895985e4c55a7bbf2bfc8fd23d5b8c95b95.tar.gz
krb5-07105895985e4c55a7bbf2bfc8fd23d5b8c95b95.tar.bz2
Document correct flag names for kadm5.acl
kadm5.acl entries can include restrictions which can force flag values on or off. These flag values are parsed with krb5_string_to_flags(), which means the flag names are the ones for default_principal_flags, not the ones for kadmin addprinc/modprinc. (cherry picked from commit ef21069070c1eb2ab1ade1d1406f5cd3920c83a9) (cherry picked from commit 185114aa35508e46c90354d8ddea76f65fe556d8) ticket: 8184 (new) version_fixed: 1.12.4 status: resolved
-rw-r--r--doc/admin/conf_files/kadm5_acl.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/admin/conf_files/kadm5_acl.rst b/doc/admin/conf_files/kadm5_acl.rst
index cd41864..0160d70 100644
--- a/doc/admin/conf_files/kadm5_acl.rst
+++ b/doc/admin/conf_files/kadm5_acl.rst
@@ -72,8 +72,8 @@ ignored. Lines containing ACL entries have the format::
{+\|-}\ *flagname*
flag is forced to the indicated value. The permissible flags
- are the same as the + and - flags for the kadmin
- :ref:`add_principal` and :ref:`modify_principal` commands.
+ are the same as those for the **default_principal_flags**
+ variable in :ref:`kdc.conf(5)`.
*-clearpolicy*
policy is forced to be empty.