From: Quanah Gibson-Mount Date: Thu, 13 Aug 2009 02:55:06 +0000 (+0000) Subject: ITS#6049 X-Git-Tag: OPENLDAP_REL_ENG_2_4_18~51 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=40f2df0588531c849f2e90fd53faa7435cde2e3d;p=openldap ITS#6049 --- diff --git a/CHANGES b/CHANGES index 2b60d23df8..971fb11e93 100644 --- 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 c39b9c1a21..c1c489a475 100644 --- 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 [!][=] 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 [= (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 871e233bf3..412ad85932 100644 --- a/clients/tools/ldapcompare.c +++ b/clients/tools/ldapcompare.c @@ -85,6 +85,8 @@ usage( void ) fprintf( stderr, _("Compare options:\n")); fprintf( stderr, _(" -E [!][=] 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 61c78408f7..359a5c541d 100644 --- 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 277f11be2c..abd97ed1a3 100644 --- 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= (transaction)\n")); diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c index 201d2458c3..93570f701e 100644 --- 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 ee2c8bad0d..88e655e63a 100644 --- 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 [!][=] 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, _(" [!]=: (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"));