Adjust -Z[Z] usage statements

Change ldapsearch to only produce LDIF.

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index ff1675528c9b982fe2e5711e0a5bf4d621573b18..7198c29822d37da588a8a39b12be5566c53b9bbc 100644 (file)
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -72,7 +72,7 @@ usage( const char *s )
 "      -W\t\tprompt for bind passwd\n"
 "      -X id\t\tSASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
 "      -Y mech\t\tSASL mechanism\n"
-"      -Z\t\trequest the use of TLS (-ZZ to make it critical)\n"
+"      -Z\t\tissue Start TLS request (-ZZ to require successful response)\n"
 ,              s );
 
        exit( EXIT_FAILURE );

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 5789f3dd2d9783f6c37b44bdb2b3348545085881..872b7b38c6b5c28ad4e01387793228c6a49cd1cc 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -113,7 +113,7 @@ usage( const char *prog )
 "      -w passwd\tbind password (for Simple authentication)\n"
 "      -X id\t\tSASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
 "      -Y mech\t\tSASL mechanism\n"
-"      -Z\t\trequest the use of TLS (-ZZ to make it critical)\n"
+"      -Z\t\tissue Start TLS request (-ZZ to require successful response)\n"
             , prog, (strcmp( prog, "ldapadd" ) ? " is to replace" : "") );
     exit( EXIT_FAILURE );
 }

diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index c7f20c778aa9d5bfaa7f4ad68e54fdfe2ef8fdf9..12478dc2224e3a73afc24dc9fd0ee7212115b8c7 100644 (file)
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -85,7 +85,7 @@ usage( const char *s )
 "      -W\t\tprompt for bind passwd\n"
 "      -X id\t\tSASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
 "      -Y mech\t\tSASL mechanism\n"
-"      -Z\t\trequest the use of TLS (-ZZ to make it critical)\n"
+"      -Z\t\tissue Start TLS request (-ZZ to require successful response)\n"
 ,              s );
 
        exit( EXIT_FAILURE );

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index ba01854048123d8bf88443a59fd92b167989fa1a..2da63eb81eba054aa1a5b02f0891643efa570fa2 100644 (file)
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -49,7 +49,7 @@ usage(const char *s)
 "      -W\t\tprompt for bind password\n"
 "      -X id\t\tSASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
 "      -Y mech\t\tSASL mechanism\n"
-"      -Z\t\trequest the use of TLS (-ZZ to make it critical)\n"
+"      -Z\t\tissue Start TLS request (-ZZ to require successful response)\n"
                , s );
 
        exit( EXIT_FAILURE );

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 8b8aa3ee007e2eee58a5e30b32cb6284d719cac0..f35c4d4fee37b26cbe5c0041c7462dfe9dec3752 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -51,20 +51,17 @@ usage( const char *s )
 "              \tdereferencing)\n"
 "      -A\t\tretrieve attribute names only (no values)\n"
 "      -b basedn\tbase dn for search\n"
-"      -B\t\tdo not suppress printing of binary values\n"
 "      -d level\tset LDAP debugging level to `level'\n"
 "      -D binddn\tbind DN\n"
 "      -E\t\trequest SASL privacy (-EE to make it critical)\n"
 "      -f file\t\tperform sequence of searches listed in `file'\n"
-"      -F sep\t\tprint `sep' instead of `=' between attribute names and\n"
-"              \tvalues\n"
 "      -h host\t\tLDAP server\n"
 "      -I\t\trequest SASL integrity checking (-II to make it\n"
 "              \tcritical)\n"
 "      -k\t\tuse Kerberos authentication\n"
 "      -K\t\tlike -k, but do only step 1 of the Kerberos bind\n"
 "      -l limit\ttime limit (in seconds) for search\n"
-"      -L\t\tprint entries in LDIF format (implies -B)\n"
+"      -L\t\tprint entries in LDIF format (default)\n"
 "      -LL\t\tprint entries in LDIF format without comments\n"
 "      -LLL\t\tprint entries in LDIF format without comments and\n"
 "              \tversion\n"
@@ -88,7 +85,7 @@ usage( const char *s )
 "      -X id\t\tSASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
 "      -Y mech\t\tSASL mechanism\n"
 "      -z limit\tsize limit (in entries) for search\n"
-"      -Z\t\trequest the use of TLS (-ZZ to make it critical)\n"
+"      -Z\t\tissue Start TLS request (-ZZ to require successful response)\n"
 ,              s );
 
        exit( EXIT_FAILURE );
@@ -369,9 +366,10 @@ main( int argc, char **argv )
        }
        }
 
+#define LDAP_LDIF 1
 #ifdef LDAP_LDIF
        /* no alternative format */
-       if( ldif < 1 ) ldif = 1;
+       if( ldif == 0 ) ldif = 1;
 #endif
 
        if ( ( authmethod == LDAP_AUTH_KRBV4 ) || ( authmethod ==