-E/-e are not just for controls

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
 			 */

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
 

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
 

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
 

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
 

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

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;

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