From e7791e2f9356a04f9130d30942c3e8ba0165e841 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 19 Jun 2000 16:19:59 +0000 Subject: [PATCH] Adjust -Z[Z] usage statements Change ldapsearch to only produce LDIF. --- clients/tools/ldapdelete.c | 2 +- clients/tools/ldapmodify.c | 2 +- clients/tools/ldapmodrdn.c | 2 +- clients/tools/ldappasswd.c | 2 +- clients/tools/ldapsearch.c | 10 ++++------ 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c index ff1675528c..7198c29822 100644 --- 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:\" or \"u:\")\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 5789f3dd2d..872b7b38c6 100644 --- 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:\" or \"u:\")\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 c7f20c778a..12478dc222 100644 --- 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:\" or \"u:\")\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 ba01854048..2da63eb81e 100644 --- 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:\" or \"u:\")\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 8b8aa3ee00..f35c4d4fee 100644 --- 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:\" or \"u:\")\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 == -- 2.39.5