ITS#6049

diff --git a/CHANGES b/CHANGES
index 2b60d23df8d6cc4e7d0d65c1d018bcd2ffa0120e..971fb11e9324a55d6ecd4b310b920495001ef063 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.18 Engineering
+       Fixed client tools common options (ITS#6049)
        Fixed liblber speed and other problems (ITS#6215)
        Fixed libldap error parsing (ITS#6197)
        Fixed libldap native getpass usage (ITS#4643)

diff --git a/clients/tools/common.c b/clients/tools/common.c
index c39b9c1a2154c2fbebf1adf93bd5065317e5d6b9..c1c489a4758f0cb86758377c99040ba33c7813fe 100644 (file)
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -271,7 +271,6 @@ void
 tool_common_usage( void )
 {
        static const char *const descriptions[] = {
-N_("  -c         continuous operation mode (do not stop on errors)\n"),
 N_("  -d level   set LDAP debugging level to `level'\n"),
 N_("  -D binddn  bind DN\n"),
 N_("  -e [!]<ext>[=<extparam>] general extensions (! indicates criticality)\n")
@@ -302,18 +301,15 @@ N_("             [!]sessiontracking\n")
 N_("             abandon, cancel, ignore (SIGINT sends abandon/cancel,\n"
    "             or ignores response; if critical, doesn't wait for SIGINT.\n"
    "             not really controls)\n")
-N_("  -f file    read operations from `file'\n"),
 N_("  -h host    LDAP server\n"),
 N_("  -H URI     LDAP Uniform Resource Identifier(s)\n"),
 N_("  -I         use SASL Interactive mode\n"),
-N_("  -M         enable Manage DSA IT control (-MM to make critical)\n"),
 N_("  -n         show what would be done but don't actually do it\n"),
 N_("  -N         do not use reverse DNS to canonicalize SASL host name\n"),
 N_("  -O props   SASL security properties\n"),
 N_("  -o <opt>[=<optparam] general options\n"),
 N_("             nettimeout=<timeout> (in seconds, or \"none\" or \"max\")\n"),
 N_("  -p port    port on LDAP server\n"),
-N_("  -P version protocol version (default: 3)\n"),
 N_("  -Q         use SASL Quiet mode\n"),
 N_("  -R realm   SASL realm\n"),
 N_("  -U authcid SASL authentication identity\n"),

diff --git a/clients/tools/ldapcompare.c b/clients/tools/ldapcompare.c
index 871e233bf3a5146e8590b338f757699798ded07f..412ad85932ffa783bc929540342f2e050bf97e94 100644 (file)
--- a/clients/tools/ldapcompare.c
+++ b/clients/tools/ldapcompare.c
@@ -85,6 +85,8 @@ usage( void )
        fprintf( stderr, _("Compare options:\n"));
        fprintf( stderr, _("  -E [!]<ext>[=<extparam>] compare extensions (! indicates criticality)\n"));
        fprintf( stderr, _("             !dontUseCopy                (Don't Use Copy)\n"));
+       fprintf( stderr, _("  -M         enable Manage DSA IT control (-MM to make critical)\n"));
+       fprintf( stderr, _("  -P version protocol version (default: 3)\n"));
        fprintf( stderr, _("  -z         Quiet mode,"
                " don't print anything, use return values\n"));
        tool_common_usage();

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index 61c78408f7a5b47d2411a9bf5f5233dcd2b68ee2..359a5c541d4571889a914152ccb338e72b504e6a 100644 (file)
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -71,6 +71,10 @@ usage( void )
        fprintf( stderr, _("    dn: list of DNs to delete. If not given, it will be readed from stdin\n"));
        fprintf( stderr, _("        or from the file specified with \"-f file\".\n"));
        fprintf( stderr, _("Delete Options:\n"));
+       fprintf( stderr, _("  -c         continuous operation mode (do not stop on errors)\n"));
+       fprintf( stderr, _("  -f file    read operations from `file'\n"));
+       fprintf( stderr, _("  -M         enable Manage DSA IT control (-MM to make critical)\n"));
+       fprintf( stderr, _("  -P version protocol version (default: 3)\n"));
        fprintf( stderr, _("  -r         delete recursively\n"));
        tool_common_usage();
        exit( EXIT_FAILURE );

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 277f11be2cc31875336d90c331aa72496934c5c6..abd97ed1a35ad6b08fb6ad1367f57914acfb7633 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -137,8 +137,12 @@ usage( void )
        fprintf( stderr, _("Add or modify options:\n"));
        fprintf( stderr, _("  -a         add values (%s)\n"),
                (ldapadd ? _("default") : _("default is to replace")));
+       fprintf( stderr, _("  -c         continuous operation mode (do not stop on errors)\n"));
        fprintf( stderr, _("  -E [!]ext=extparam        modify extensions"
                " (! indicate s criticality)\n"));
+       fprintf( stderr, _("  -f file    read operations from `file'\n"));
+       fprintf( stderr, _("  -M         enable Manage DSA IT control (-MM to make critical)\n"));
+       fprintf( stderr, _("  -P version protocol version (default: 3)\n"));
 #ifdef LDAP_X_TXN
        fprintf( stderr,
                _("             [!]txn=<commit|abort>         (transaction)\n"));

diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index 201d2458c38bb7163bcd308ab5ad1631db64cea4..93570f701ec3e36caa58242d10c92c90b9277f87 100644 (file)
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -83,6 +83,10 @@ usage( void )
        fprintf( stderr, _("            If not given, the list of modifications is read from stdin or\n"));
        fprintf( stderr, _("            from the file specified by \"-f file\" (see man page).\n"));
        fprintf( stderr, _("Rename options:\n"));
+       fprintf( stderr, _("  -c         continuous operation mode (do not stop on errors)\n"));
+       fprintf( stderr, _("  -f file    read operations from `file'\n"));
+       fprintf( stderr, _("  -M         enable Manage DSA IT control (-MM to make critical)\n"));
+       fprintf( stderr, _("  -P version protocol version (default: 3)\n"));
        fprintf( stderr, _("  -r                 remove old RDN\n"));
        fprintf( stderr, _("  -s newsup  new superior entry\n"));
        tool_common_usage();

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index ee2c8bad0d751b9c1d3d50fb7649e35e08153578..88e655e63aca647fc0ba901ca84ae283f3f23d34 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -123,6 +123,7 @@ usage( void )
        fprintf( stderr, _("  -a deref   one of never (default), always, search, or find\n"));
        fprintf( stderr, _("  -A         retrieve attribute names only (no values)\n"));
        fprintf( stderr, _("  -b basedn  base dn for search\n"));
+       fprintf( stderr, _("  -c         continuous operation mode (do not stop on errors)\n"));
        fprintf( stderr, _("  -E [!]<ext>[=<extparam>] search extensions (! indicates criticality)\n"));
        fprintf( stderr, _("             [!]domainScope              (domain scope)\n"));
        fprintf( stderr, _("             !dontUseCopy                (Don't Use Copy)\n"));
@@ -139,12 +140,15 @@ usage( void )
        fprintf( stderr, _("             [!]deref=derefAttr:attr[,...][;derefAttr:attr[,...][;...]]\n"));
 #endif
        fprintf( stderr, _("             [!]<oid>=:<value>           (generic control; no response handling)\n"));
+       fprintf( stderr, _("  -f file    read operations from `file'\n"));
        fprintf( stderr, _("  -F prefix  URL prefix for files (default: %s)\n"), def_urlpre);
        fprintf( stderr, _("  -l limit   time limit (in seconds, or \"none\" or \"max\") for search\n"));
        fprintf( stderr, _("  -L         print responses in LDIFv1 format\n"));
        fprintf( stderr, _("  -LL        print responses in LDIF format without comments\n"));
        fprintf( stderr, _("  -LLL       print responses in LDIF format without comments\n"));
        fprintf( stderr, _("             and version\n"));
+       fprintf( stderr, _("  -M         enable Manage DSA IT control (-MM to make critical)\n"));
+       fprintf( stderr, _("  -P version protocol version (default: 3)\n"));
        fprintf( stderr, _("  -s scope   one of base, one, sub or children (search scope)\n"));
        fprintf( stderr, _("  -S attr    sort the results by attribute `attr'\n"));
        fprintf( stderr, _("  -t         write binary values to files in temporary directory\n"));