Be a bit more liberal

[openldap] / clients / tools / ldappasswd.c

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index 7928d4c05ce14c7911c750c52a216cb08b6613e7..b79e4d3f23a431caeaccfdcbccb5725c9cfe1277 100644 (file)
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -49,12 +49,12 @@ usage(const char *s)
 "  -p port    port on LDAP server\n"
 "  -Q         use SASL Quiet mode\n"
 "  -R realm   SASL realm\n"
-"  -U user    SASL authentication identity (username)\n"
+"  -U authcid SASL authentication identity\n"
 "  -v         run in verbose mode (diagnostics to standard output)\n"
 "  -w passwd  bind passwd (for simple authentication)\n"
 "  -W         prompt for bind passwd\n"
 "  -x         Simple authentication\n"
-"  -X id      SASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
+"  -X authzid SASL authorization identity (\"dn:<dn>\" or \"u:<user>\")\n"
 "  -Y mech    SASL mechanism\n"
 "  -Z         Start TLS request (-ZZ to require successful response)\n"
                , s );
@@ -124,7 +124,7 @@ main( int argc, char *argv[] )
                        {
                                char* p;
 
-                               for( p = optarg; *p == '\0'; p++ ) {
+                               for( p = optarg; *p != '\0'; p++ ) {
                                        *p = '\0';
                                }
                        }
@@ -139,7 +139,7 @@ main( int argc, char *argv[] )
                        {
                                char* p;
 
-                               for( p = optarg; *p == '\0'; p++ ) {
+                               for( p = optarg; *p != '\0'; p++ ) {
                                        *p = '\0';
                                }
                        }
@@ -154,33 +154,33 @@ main( int argc, char *argv[] )
            break;
        case 'D':       /* bind DN */
                if( binddn != NULL ) {
-                       fprintf( stderr, "%s: -D previously specified\n" );
+                       fprintf( stderr, "%s: -D previously specified\n", prog );
                        return EXIT_FAILURE;
                }
            binddn = strdup( optarg );
            break;
        case 'h':       /* ldap host */
                if( ldapuri != NULL ) {
-                       fprintf( stderr, "%s: -h incompatible with -H\n" );
+                       fprintf( stderr, "%s: -h incompatible with -H\n", prog );
                        return EXIT_FAILURE;
                }
                if( ldaphost != NULL ) {
-                       fprintf( stderr, "%s: -h previously specified\n" );
+                       fprintf( stderr, "%s: -h previously specified\n", prog );
                        return EXIT_FAILURE;
                }
            ldaphost = strdup( optarg );
            break;
        case 'H':       /* ldap URI */
                if( ldaphost != NULL ) {
-                       fprintf( stderr, "%s: -H incompatible with -h\n" );
+                       fprintf( stderr, "%s: -H incompatible with -h\n", prog );
                        return EXIT_FAILURE;
                }
                if( ldapport ) {
-                       fprintf( stderr, "%s: -H incompatible with -p\n" );
+                       fprintf( stderr, "%s: -H incompatible with -p\n", prog );
                        return EXIT_FAILURE;
                }
                if( ldapuri != NULL ) {
-                       fprintf( stderr, "%s: -H previously specified\n" );
+                       fprintf( stderr, "%s: -H previously specified\n", prog );
                        return EXIT_FAILURE;
                }
            ldapuri = strdup( optarg );
@@ -262,7 +262,7 @@ main( int argc, char *argv[] )
        case 'O':
 #ifdef HAVE_CYRUS_SASL
                if( sasl_secprops != NULL ) {
-                       fprintf( stderr, "%s: -O previously specified\n" );
+                       fprintf( stderr, "%s: -O previously specified\n", prog );
                        return EXIT_FAILURE;
                }
                if( version == LDAP_VERSION2 ) {
@@ -286,7 +286,7 @@ main( int argc, char *argv[] )
                break;
        case 'p':
                if( ldapport ) {
-                       fprintf( stderr, "%s: -p previously specified\n" );
+                       fprintf( stderr, "%s: -p previously specified\n", prog );
                        return EXIT_FAILURE;
                }
            ldapport = atoi( optarg );
@@ -340,7 +340,7 @@ main( int argc, char *argv[] )
        case 'R':
 #ifdef HAVE_CYRUS_SASL
                if( sasl_realm != NULL ) {
-                       fprintf( stderr, "%s: -R previously specified\n" );
+                       fprintf( stderr, "%s: -R previously specified\n", prog );
                        return EXIT_FAILURE;
                }
                if( version == LDAP_VERSION2 ) {
@@ -366,7 +366,7 @@ main( int argc, char *argv[] )
        case 'U':
 #ifdef HAVE_CYRUS_SASL
                if( sasl_authc_id != NULL ) {
-                       fprintf( stderr, "%s: -U previously specified\n" );
+                       fprintf( stderr, "%s: -U previously specified\n", prog );
                        return EXIT_FAILURE;
                }
                if( version == LDAP_VERSION2 ) {
@@ -397,7 +397,7 @@ main( int argc, char *argv[] )
                {
                        char* p;
 
-                       for( p = optarg; *p == '\0'; p++ ) {
+                       for( p = optarg; *p != '\0'; p++ ) {
                                *p = '\0';
                        }
                }
@@ -409,7 +409,7 @@ main( int argc, char *argv[] )
        case 'Y':
 #ifdef HAVE_CYRUS_SASL
                if( sasl_mech != NULL ) {
-                       fprintf( stderr, "%s: -Y previously specified\n" );
+                       fprintf( stderr, "%s: -Y previously specified\n", prog );
                        return EXIT_FAILURE;
                }
                if( version == LDAP_VERSION2 ) {
@@ -441,7 +441,7 @@ main( int argc, char *argv[] )
        case 'X':
 #ifdef HAVE_CYRUS_SASL
                if( sasl_authz_id != NULL ) {
-                       fprintf( stderr, "%s: -X previously specified\n" );
+                       fprintf( stderr, "%s: -X previously specified\n", prog );
                        return EXIT_FAILURE;
                }
                if( version == LDAP_VERSION2 ) {
@@ -481,7 +481,7 @@ main( int argc, char *argv[] )
 
 
                default:
-                       fprintf( stderr, "%s: unrecongized option -%c\n",
+                       fprintf( stderr, "%s: unrecognized option -%c\n",
                                prog, optopt );
                        usage (argv[0]);
                }
@@ -533,7 +533,6 @@ main( int argc, char *argv[] )
 
        if (want_bindpw && passwd.bv_val == NULL ) {
                /* handle bind password */
-               fprintf( stderr, "Bind DN: %s\n", binddn );
                passwd.bv_val = strdup( getpassphrase("Enter bind password: "));
                passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
        }
@@ -558,20 +557,25 @@ main( int argc, char *argv[] )
                                ldaphost != NULL ? ldaphost : "<DEFAULT>",
                                ldapport );
                }
+
                ld = ldap_init( ldaphost, ldapport );
+               if( ld == NULL ) {
+                       perror("ldapsearch: ldap_init");
+                       return EXIT_FAILURE;
+               }
 
        } else {
                if ( verbose ) {
                        fprintf( stderr, "ldap_initialize( %s )\n",
                                ldapuri != NULL ? ldapuri : "<DEFAULT>" );
                }
-               (void) ldap_initialize( &ld, ldapuri );
-       }
 
-       if( ld == NULL ) {
-               fprintf( stderr, "Could not create LDAP session handle (%d): %s\n",
-                       rc, ldap_err2string(rc) );
-               return EXIT_FAILURE;
+               rc = ldap_initialize( &ld, ldapuri );
+               if( rc != LDAP_SUCCESS ) {
+                       fprintf( stderr, "Could not create LDAP session handle (%d): %s\n",
+                               rc, ldap_err2string(rc) );
+                       return EXIT_FAILURE;
+               }
        }
 
        /* referrals */
@@ -584,7 +588,7 @@ main( int argc, char *argv[] )
        }
 
        /* LDAPv3 only */
-       version = 3;
+       version = LDAP_VERSION3;
        rc = ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version );
 
        if(rc != LDAP_OPT_SUCCESS ) {
@@ -593,11 +597,10 @@ main( int argc, char *argv[] )
        }
 
        if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) {
+               ldap_perror( ld, "ldap_start_tls" );
                if ( use_tls > 1 ) {
-                       ldap_perror( ld, "ldap_start_tls" );
                        return( EXIT_FAILURE );
                }
-               fprintf( stderr, "WARNING: could not start TLS\n" );
        }
 
        if ( authmethod == LDAP_AUTH_SASL ) {
@@ -665,7 +668,7 @@ main( int argc, char *argv[] )
 
                if( oldpw != NULL ) {
                        ber_printf( ber, "ts",
-                               LDAP_TAG_EXOP_X_MODIFY_PASSWD_NEW, oldpw );
+                               LDAP_TAG_EXOP_X_MODIFY_PASSWD_OLD, oldpw );
                        free(oldpw);
                }