-E/-e are not just for controls

diff --git a/clients/tools/common.c b/clients/tools/common.c
index 83167d3bb2dc764b24fd2944cd82570fa5290fcf..94840f39c33e9613af386332606f8c8b185eec70 100644 (file)
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -98,7 +98,7 @@ N_("  -c         continuous operation mode (do not stop on errors)\n"),
 N_("  -C         chase referrals (anonymously)\n"),
 N_("  -d level   set LDAP debugging level to `level'\n"),
 N_("  -D binddn  bind DN\n"),
-N_("  -e [!]<ctrl>[=<ctrlparam>] general controls (! indicates criticality)\n")
+N_("  -e [!]<ext>[=<extparam>] general extensions (! indicates criticality)\n")
 N_("             [!]assert=<filter>     (an RFC 2254 Filter)\n")
 N_("             [!]authzid=<authzid>   (\"dn:<dn>\" or \"u:<user>\")\n")
 N_("             [!]manageDSAit\n")
@@ -166,7 +166,7 @@ tool_args( int argc, char **argv )
                        }
                        binddn = ber_strdup( optarg );
                        break;
-               case 'e': /* general controls */
+               case 'e': /* general extensions (controls and such) */
                        /* should be extended to support comma separated list of
                         *      [!]key[=value] parameters, e.g.  -e !foo,bar=567
                         */

diff --git a/clients/tools/ldapcompare.c b/clients/tools/ldapcompare.c
index 22f2852cace16cbd1fae3b88ee58ec12d6abb7fc..056b47ac777db2eef31869dd44f8417998daf0d0 100644 (file)
--- a/clients/tools/ldapcompare.c
+++ b/clients/tools/ldapcompare.c
@@ -107,7 +107,7 @@ handle_private_option( int i )
 #if 0
                char    *control, *cvalue;
                int             crit;
-       case 'E': /* compare controls */
+       case 'E': /* compare extensions */
                if( protocol == LDAP_VERSION2 ) {
                        fprintf( stderr, _("%s: -E incompatible with LDAPv%d\n"),
                                prog, protocol );
@@ -129,7 +129,7 @@ handle_private_option( int i )
                if ( (cvalue = strchr( control, '=' )) != NULL ) {
                        *cvalue++ = '\0';
                }
-               fprintf( stderr, _("Invalid compare control name: %s\n"), control );
+               fprintf( stderr, _("Invalid compare extension name: %s\n"), control );
                usage();
 #endif
 

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index 420949f7a149f582209e5fe53c7c8f40aa41e57f..1c19abbe96e188e0f54d9657fdc116bc1746157f 100644 (file)
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -83,7 +83,7 @@ handle_private_option( int i )
 #if 0
                int crit;
                char *control, *cvalue;
-       case 'E': /* delete controls */
+       case 'E': /* delete extensions */
                if( protocol == LDAP_VERSION2 ) {
                        fprintf( stderr, _("%s: -E incompatible with LDAPv%d\n"),
                                prog, protocol );
@@ -105,7 +105,7 @@ handle_private_option( int i )
                if ( (cvalue = strchr( control, '=' )) != NULL ) {
                        *cvalue++ = '\0';
                }
-               fprintf( stderr, _("Invalid delete control name: %s\n"), control );
+               fprintf( stderr, _("Invalid delete extension name: %s\n"), control );
                usage();
 #endif
 

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 2264bce9fbb8e993d4b9fb0feefe42cd4bdf45a9..7ccd816c60b41f59763044119830ba970b95332c 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -143,7 +143,7 @@ handle_private_option( int i )
 #if 0
                char    *control, *cvalue;
                int             crit;
-       case 'E': /* modify controls */
+       case 'E': /* modify extensions */
                if( protocol == LDAP_VERSION2 ) {
                        fprintf( stderr, _("%s: -E incompatible with LDAPv%d\n"),
                                prog, protocol );
@@ -165,7 +165,8 @@ handle_private_option( int i )
                if ( (cvalue = strchr( control, '=' )) != NULL ) {
                        *cvalue++ = '\0';
                }
-               fprintf( stderr, _("Invalid modify control name: %s\n"), control );
+
+               fprintf( stderr, _("Invalid modify extension name: %s\n"), control );
                usage();
 #endif
 

diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index 6bc82fc716e7ea0a569e98c958a9270721fa2900..75dc7a00195e3b378ac29486c65c078dbd5e5859 100644 (file)
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -98,7 +98,7 @@ handle_private_option( int i )
 #if 0
                int crit;
                char *control, *cvalue;
-       case 'E': /* modrdn controls */
+       case 'E': /* modrdn extensions */
                if( protocol == LDAP_VERSION2 ) {
                        fprintf( stderr, _("%s: -E incompatible with LDAPv%d\n"),
                                prog, version );
@@ -120,7 +120,7 @@ handle_private_option( int i )
                if ( (cvalue = strchr( control, '=' )) != NULL ) {
                        *cvalue++ = '\0';
                }
-               fprintf( stderr, _("Invalid modrdn control name: %s\n"), control );
+               fprintf( stderr, _("Invalid modrdn extension name: %s\n"), control );
                usage();
 #endif
 

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index 3f7af44dbe8dd4b9ec4057a83b951807e9b8c537..d20daf9d658964fa1678a73081f60f75a89f6f06 100644 (file)
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -88,7 +88,7 @@ handle_private_option( int i )
 {
        switch ( i ) {
 #if 0
-       case 'E': /* passwd controls */ {
+       case 'E': /* passwd extensions */ {
                int             crit;
                char    *control, *cvalue;
                if( protocol == LDAP_VERSION2 ) {
@@ -112,7 +112,7 @@ handle_private_option( int i )
                if ( (cvalue = strchr( control, '=' )) != NULL ) {
                        *cvalue++ = '\0';
                }
-               fprintf( stderr, _("Invalid passwd control name: %s\n"), control );
+               fprintf( stderr, _("Invalid passwd extension name: %s\n"), control );
                usage();
                }
 #endif

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 5056f76e93e92c742d1a12ce2a1389325975c698..5a8240d2fe1ade87404667da872c29ed595b4729 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -102,7 +102,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, _("  -E [!]<ctrl>[=<ctrlparam>] search controls (! indicates criticality)\n"));
+       fprintf( stderr, _("  -E [!]<ctrl>[=<ctrlparam>] search extensions (! indicates criticality)\n"));
 #ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
        fprintf( stderr, _("             [!]domainScope              (domain scope)\n"));
 #endif
@@ -255,7 +255,7 @@ handle_private_option( int i )
        case 'b': /* search base */
                base = strdup( optarg );
                break;
-       case 'E': /* search controls */
+       case 'E': /* search extensions */
                if( protocol == LDAP_VERSION2 ) {
                        fprintf( stderr, _("%s: -E incompatible with LDAPv%d\n"),
                                prog, protocol );
@@ -411,7 +411,7 @@ handle_private_option( int i )
                        if ( crit ) ldapsync *= -1;
 
                } else {
-                       fprintf( stderr, _("Invalid control name: %s\n"), control );
+                       fprintf( stderr, _("Invalid search extension name: %s\n"), control );
                        usage();
                }
                break;

diff --git a/clients/tools/ldapwhoami.c b/clients/tools/ldapwhoami.c
index bb731be1d2efbd1a45f4febc6273fd7c1cec9018..1eba2b60a6795d4e23a9b1f09b206d74d66f5dae 100644 (file)
--- a/clients/tools/ldapwhoami.c
+++ b/clients/tools/ldapwhoami.c
@@ -71,7 +71,7 @@ handle_private_option( int i )
 #if 0
                char    *control, *cvalue;
                int             crit;
-       case 'E': /* whoami controls */
+       case 'E': /* whoami extension */
                if( protocol == LDAP_VERSION2 ) {
                        fprintf( stderr, _("%s: -E incompatible with LDAPv%d\n"),
                                prog, protocol );
@@ -93,7 +93,8 @@ handle_private_option( int i )
                if ( (cvalue = strchr( control, '=' )) != NULL ) {
                        *cvalue++ = '\0';
                }
-               fprintf( stderr, _("Invalid whoami control name: %s\n"), control );
+
+               fprintf( stderr, _("Invalid whoami extension name: %s\n"), control );
                usage();
 #endif