From: Barry Jaspan <bjaspan@mit.edu>
Date: Mon, 4 Nov 1996 22:08:49 +0000 (+0000)
Subject: 	* admin.texinfo (Adding or Modifying Principals): update kadmin
X-Git-Tag: krb5-1.0-freeze1~132
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b7632dbdb3f09b903551a96589bd8835b1f46ea1;p=krb5.git

	* admin.texinfo (Adding or Modifying Principals): update kadmin
 	"default" policy semantics [krb5-doc/84]

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9293 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 7cbc0f4a1..69b16f37c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,8 @@
 Mon Nov  4 16:50:51 1996  Barry Jaspan  <bjaspan@mit.edu>
 
+	* admin.texinfo (Adding or Modifying Principals): update kadmin
+ 	"default" policy semantics [krb5-doc/84]
+
 	* install.texinfo: various minor comments from jhawk [krb5-doc/55]
 
 Fri Nov  1 19:05:15 1996  Tom Yu  <tlyu@mit.edu>
diff --git a/doc/admin.texinfo b/doc/admin.texinfo
index fcff1ccac..26bb97e4b 100644
--- a/doc/admin.texinfo
+++ b/doc/admin.texinfo
@@ -655,8 +655,10 @@ has @i{inquire} privileges.
 @subsection Adding or Modifying Principals
 
 To add a principal to the database, use the kadmin @code{add_principal}
-command, which requires the ``add'' administrative privilege.  The
-syntax is:
+command, which requires the ``add'' administrative privilege.  This
+function creates the new principal and, if neither the -policy nor
+-clearpolicy options are specified and the policy ``default'' exists,
+assigns it that policy.  The syntax is:
 
 @smallexample
 @b{kadmin:} add_principal [@i{options}] @i{principal}
@@ -692,8 +694,9 @@ are:
 @end itemize
 
 @item -clearpolicy
-removes the current policy from a principal (@code{modify_principal}
-only).
+For @code{modify_principal}, removes the current policy from a
+principal.  For @code{add_principal}, suppresses the automatic
+assignment of the policy ``default''.
 
 @item -expire @i{date}
 Sets the expiration date of the principal to @i{date}.
@@ -709,9 +712,12 @@ Explicity sets the key version number to @i{number}.  @value{COMPANY}
 does not recommend doing this unless there is a specific reason.
 
 @item -policy @i{policy}
-Sets the policy used by this principal.  (@xref{Policies}.)  If no
-policy is supplied, the principal will have no policy, and @code{kadmin}
-will print a warning message.
+Sets the policy used by this principal.  (@xref{Policies}.)  With
+@code{modify_principal}, the current policy assigned to the principal is
+set or changed.  With @code{add_principal}, if this option is not
+supplied, the -clearpolicy is not specified, and the policy ``default''
+exists, that policy is assigned.  If a principal is created with no
+policy, @code{kadmin} will print a warning message.
 
 @item @{-|+@}allow_postdated
 The ``-allow_postdated'' option prohibits this principal from obtaining