From: Tom Yu <tlyu@mit.edu>
Date: Wed, 13 Dec 2006 22:03:09 +0000 (+0000)
Subject: pull up r18919 from trunk
X-Git-Tag: krb5-1.6-beta2~25
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1900b5d52f9e485225b6500c06e7430e0f52c4c6;p=krb5.git

pull up r18919 from trunk

 r18919@cathode-dark-space:  wfiveash | 2006-12-04 17:06:13 -0500
 ticket: new
 subject: minor update to kdb5_util man page for LDAP plugin
 Target_Version: krb5-1.6
 Tags: pullup

 I added some info to the kdb5_util man page regarding the LDAP plugin.



ticket: 4994
version_fixed: 1.6

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@18951 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kadmin/dbutil/kdb5_util.M b/src/kadmin/dbutil/kdb5_util.M
index 964212b0a..0c7cac400 100644
--- a/src/kadmin/dbutil/kdb5_util.M
+++ b/src/kadmin/dbutil/kdb5_util.M
@@ -34,6 +34,10 @@ However, execution continues regardless of whether or not
 .B kdb5_util
 successfully opens the database, because the database may not exist yet
 or the stash file may be corrupt.
+.PP
+Note that some KDB plugins may not support all
+.B kdb5_util
+commands.
 .SH COMMAND-LINE OPTIONS
 .TP
 \fB\-r\fP\ \fIrealm\fP
@@ -159,7 +163,10 @@ automatically and handled as appropriate.  Unless the
 option is given, 
 .B load
 creates a new database containing only the principals in the dump file,
-overwriting the contents of any previously existing database.  Options:
+overwriting the contents of any previously existing database.  Note that
+when using the LDAP KDB plugin the
+.B \-update
+must be given.  Options:
 .RS
 .TP
 .B \-old