ITS#8215 Some more slapmodify manpage tweaks

diff --git a/doc/devel/toolargs b/doc/devel/toolargs
index eae05c953e58dad8618b336ac17974acdfd0664c..f0f8d9f0b3c0b7ac1103d509d5df47f24b9b3e5d 100644 (file)
--- a/doc/devel/toolargs
+++ b/doc/devel/toolargs
@@ -5,6 +5,7 @@ slapauth             F      M    R  U  X     d f        o      v
 slapcat              F H                  abcd fg    l no   s  v
 slapdn               F       N P             d f        o      v
 slapindex            F                     bcd fg      no q  t v
+slapmodify           F            S        bcd fg  j l no q s uvw
 slappasswd                         T        c    h          s uv
 slapschema          F H                  abcd fg    l no   s  v
 slaptest             F          Q            d f       no     uv
@@ -17,11 +18,12 @@ slaptest             F          Q            d f       no     uv
        -c continue mode
        -d debug level
        -f config file
+       -g disable subordinate gluing
        -l LDIF file
        -n database number
        -o options
        -q "quick" mode
-       -s subtree
+       -s disable schema checking (slapcat: subtree, slappasswd: secret)
        -u dryrun (slappasswd: RFC2307 userPassword)
        -v verbose
 

diff --git a/doc/guide/admin/aspell.en.pws b/doc/guide/admin/aspell.en.pws
index aa36213598bb1d4b7805bb7323b3293972a8162a..63d3f0ee115ce72efd69f85286dee0dda5333b6f 100644 (file)
--- a/doc/guide/admin/aspell.en.pws
+++ b/doc/guide/admin/aspell.en.pws
@@ -1672,3 +1672,4 @@ lmdb
 LMDB
 LMDB's
 MDB
+slapmodify

diff --git a/doc/man/man5/slapd-config.5 b/doc/man/man5/slapd-config.5
index 00b2260d07ec69c089133d2e8019cdfa6fcd6f96..4c53996f62fb5f84fe43b7974e2f7634f2465f12 100644 (file)
--- a/doc/man/man5/slapd-config.5
+++ b/doc/man/man5/slapd-config.5
@@ -18,6 +18,7 @@ daemon.  This configuration information is also used by the SLAPD tools
 .BR slapcat (8),
 .BR slapdn (8),
 .BR slapindex (8),
+.BR slapmodify (8),
 and
 .BR slaptest (8).
 .LP
@@ -1720,6 +1721,7 @@ database context, so that only the superior context is visible.
 If the slap tools
 .BR slapcat (8),
 .BR slapadd (8),
+.BR slapmodify (8),
 or
 .BR slapindex (8)
 are used on the superior database, any glued subordinates that support
@@ -2155,6 +2157,7 @@ default slapd configuration directory
 .BR slapcat (8),
 .BR slapdn (8),
 .BR slapindex (8),
+.BR slapmodify (8),
 .BR slappasswd (8),
 .BR slaptest (8).
 .LP

diff --git a/doc/man/man5/slapd-mdb.5 b/doc/man/man5/slapd-mdb.5
index 6de21473a4a6e361c8f40c4b065968923d91a58a..e396d017c6238e18487adf3d29418b7c34b4f6d2 100644 (file)
--- a/doc/man/man5/slapd-mdb.5
+++ b/doc/man/man5/slapd-mdb.5
@@ -222,6 +222,7 @@ configuration file
 .BR slapadd (8),
 .BR slapcat (8),
 .BR slapindex (8),
+.BR slapmodify (8),
 OpenLDAP LMDB documentation.
 .SH ACKNOWLEDGEMENTS
 .so ../Project

diff --git a/doc/man/man5/slapd-ndb.5 b/doc/man/man5/slapd-ndb.5
index de15bcf0d9905a1a6dca02e606774f618b490201..ab2347145f72f2d3db35530dc2e9ba25f251c835 100644 (file)
--- a/doc/man/man5/slapd-ndb.5
+++ b/doc/man/man5/slapd-ndb.5
@@ -121,6 +121,7 @@ configuration file
 .BR slapadd (8),
 .BR slapcat (8),
 .BR slapindex (8),
+.BR slapmodify (8),
 MySQL Cluster documentation.
 .SH AUTHOR
 Howard Chu, with assistance from Johan Andersson et al @ MySQL.

diff --git a/doc/man/man5/slapd-wt.5 b/doc/man/man5/slapd-wt.5
index 4f2123e68bb161ae93c926f9bf7bfc6dd8798ca1..d820f2cb97d8bf7990f78795263f281fb30c525a 100644 (file)
--- a/doc/man/man5/slapd-wt.5
+++ b/doc/man/man5/slapd-wt.5
@@ -84,6 +84,7 @@ configuration file
 .BR slapadd (8),
 .BR slapcat (8),
 .BR slapindex (8),
+.BR slapmodify (8),
 WiredTiger documentation.
 .SH ACKNOWLEDGEMENTS
 .so ../Project

diff --git a/doc/man/man5/slapd.access.5 b/doc/man/man5/slapd.access.5
index bd5d9352a3d413f2da6da4930a08c2a29d093d9c..080d0b00d1860d1a48897f41100130870dcaa286 100644 (file)
--- a/doc/man/man5/slapd.access.5
+++ b/doc/man/man5/slapd.access.5
@@ -18,6 +18,7 @@ daemon. This configuration file is also used by the SLAPD tools
 .BR slapcat (8),
 .BR slapdn (8),
 .BR slapindex (8),
+.BR slapmodify (8),
 and
 .BR slaptest (8).
 .LP

diff --git a/doc/man/man5/slapd.conf.5 b/doc/man/man5/slapd.conf.5
index 05d4b7d55dbc5db1c8e9da50b552e264de49132f..8f1e303d12abca40ca4f57ffa01db05fdaba9e06 100644 (file)
--- a/doc/man/man5/slapd.conf.5
+++ b/doc/man/man5/slapd.conf.5
@@ -18,6 +18,7 @@ daemon.  This configuration file is also used by the SLAPD tools
 .BR slapcat (8),
 .BR slapdn (8),
 .BR slapindex (8),
+.BR slapmodify (8),
 and
 .BR slaptest (8).
 .LP
@@ -1724,6 +1725,7 @@ database context, so that only the superior context is visible.
 If the slap tools
 .BR slapcat (8),
 .BR slapadd (8),
+.BR slapmodify (8),
 or
 .BR slapindex (8)
 are used on the superior database, any glued subordinates that support
@@ -2109,6 +2111,7 @@ default slapd configuration file
 .BR slapcat (8),
 .BR slapdn (8),
 .BR slapindex (8),
+.BR slapmodify (8),
 .BR slappasswd (8),
 .BR slaptest (8).
 .LP

diff --git a/doc/man/man5/slapd.plugin.5 b/doc/man/man5/slapd.plugin.5
index ce6de7e78a1208420250589affdbe95022060deb..6b5f9cf2be32e00eaa0b983e1848116c0ba9fc47 100644 (file)
--- a/doc/man/man5/slapd.plugin.5
+++ b/doc/man/man5/slapd.plugin.5
@@ -13,6 +13,7 @@ file contains configuration information for the
 daemon. This configuration file is also used by the SLAPD tools
 .BR slapadd (8),
 .BR slapcat (8),
+.BR slapmodify (8),
 and
 .BR slapindex (8).
 .LP

diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c
index f82b5ed330e359f8f9387e7ed1bea4dc75772df7..be24359a92c4dbd3d2ac935c91130e3003ca5059 100644 (file)
--- a/servers/slapd/slapcommon.c
+++ b/servers/slapd/slapcommon.c
@@ -91,6 +91,11 @@ usage( int tool, const char *progname )
                options = " [-c]\n\t[-g] [-n databasenumber | -b suffix] [attr ...] [-q] [-t]\n";
                break;
 
+       case SLAPMODIFY:
+               options = " [-c]\n\t[-g] [-n databasenumber | -b suffix]\n"
+                       "\t[-l ldiffile] [-j linenumber] [-q] [-u] [-s] [-w]\n";
+               break;
+
        case SLAPTEST:
                options = " [-n databasenumber] [-u] [-Q]\n";
                break;