add clarification related to ITS#5166

[openldap] / doc / man / man8 / slapadd.8

diff --git a/doc/man/man8/slapadd.8 b/doc/man/man8/slapadd.8
index 6591b741c39108cbeac967e50c76cb9ef30d3c6e..2c4e08088f7c7a42525335f570ce576865dc9518 100644 (file)
--- a/doc/man/man8/slapadd.8
+++ b/doc/man/man8/slapadd.8
@@ -1,6 +1,6 @@
 .TH SLAPADD 8C "RELEASEDATE" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$
 .TH SLAPADD 8C "RELEASEDATE" "OpenLDAP LDVERSION"
 .\" $OpenLDAP$

-.\" Copyright 1998-2006 The OpenLDAP Foundation All Rights Reserved.
+.\" Copyright 1998-2007 The OpenLDAP Foundation All Rights Reserved.

 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
 .SH NAME
 slapadd \- Add entries to a SLAPD database
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
 .SH NAME
 slapadd \- Add entries to a SLAPD database


@@ -8,15 +8,17 @@ slapadd \- Add entries to a SLAPD database
 .B SBINDIR/slapadd
 .B [\-b suffix]
 .B [\-c]
 .B SBINDIR/slapadd
 .B [\-b suffix]
 .B [\-c]

-.B [\-g]

 .B [\-d level]
 .B [\-f slapd.conf]
 .B [\-F confdir]
 .B [\-d level]
 .B [\-f slapd.conf]
 .B [\-F confdir]

+.B [\-g]

 .B [\-j lineno]
 .B [\-l ldif-file]
 .B [\-n dbnum]
 .B [\-o name[=value]
 .B [\-q]
 .B [\-j lineno]
 .B [\-l ldif-file]
 .B [\-n dbnum]
 .B [\-o name[=value]
 .B [\-q]

+.B [\-s]
+.B [\-S SID]

 .B [\-u]
 .B [\-v]
 .B [\-w]
 .B [\-u]
 .B [\-v]
 .B [\-w]


@@ -34,15 +36,21 @@ Databases configured as
 .B subordinate
 of this one are also updated, unless \fB-g\fP is specified.
 The LDIF input is read from standard input or the specified file.
 .B subordinate
 of this one are also updated, unless \fB-g\fP is specified.
 The LDIF input is read from standard input or the specified file.

-.LP
-As
-.B slapadd
-is designed to accept LDIF in database order, as produced by
-.BR slapcat (8),
-it does not verify that superior entries exist before
-adding an entry, does not perform all user and system
-schema checks, and does not maintain operational
-attributes (such as createTimeStamp and modifiersName). 
+
+All files eventually created by
+.BR slapadd (8)
+will belong to the identity
+.BR slapadd (8)
+is run as, so make sure you either run
+.BR slapadd (8)
+with the same identity
+.BR slapd (8)
+will be run as (see option
+.B \-u
+in
+.BR slapd (8)),
+or change file ownership before running
+.BR slapd (8).

 .SH OPTIONS
 .TP
 .BI \-b " suffix" 
 .SH OPTIONS
 .TP
 .BI \-b " suffix" 


@@ -127,6 +135,10 @@ databases containing special objects, such as fractional objects on a
 partial replica.  Loading normal objects which do not conform to
 schema may result in unexpected and ill behavior.
 .TP
 partial replica.  Loading normal objects which do not conform to
 schema may result in unexpected and ill behavior.
 .TP

+.B \-S " SID"
+Server ID to use in generated entryCSN.  Also used for contextCSN
+if `\-w' is set as well.  Defaults to 0.
+.TP

 .B \-u
 enable dry-run (don't write to backend) mode.
 .TP
 .B \-u
 enable dry-run (don't write to backend) mode.
 .TP