example client using new logging

[openldap] / clients / tools / ldappasswd.c

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index 9a6cb8838a5ef16903122385c803cf656b051269..b0cdfb6dea4f8d95883831cfb412320d78be8b8e 100644 (file)
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -29,8 +29,8 @@ usage(const char *s)
 {
        fprintf(stderr,
 "Change password of an LDAP user\n\n"
-"usage: %s [options] user\n"
-"  user: the identity of the user, normally a DN\n"
+"usage: %s [options] [user]\n"
+"  user: the autentication identity, commonly a DN\n"
 "Password change options:\n"
 "  -a secret  old password\n"
 "  -A         prompt for old password\n"
@@ -70,7 +70,7 @@ main( int argc, char *argv[] )
        char    *ldaphost = NULL;
        char    *ldapuri = NULL;
 
-       char    *dn = NULL;
+       char    *user = NULL;
        char    *binddn = NULL;
 
        struct berval passwd = { 0, NULL };
@@ -109,11 +109,8 @@ main( int argc, char *argv[] )
 
     prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : prog + 1;
 
-       if (argc == 1)
-               usage (argv[0]);
-
-       while( (i = getopt( argc, argv,
-               "Aa:Ss:" "Cd:D:h:H:InO:p:QRU:vw:WxX:Y:Z" )) != EOF )
+       while( (i = getopt( argc, argv, "Aa:Ss:"
+               "Cd:D:h:H:InO:p:QR:U:vw:WxX:Y:Z" )) != EOF )
        {
                switch (i) {
                /* Password Options */
@@ -157,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 );
@@ -265,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 ) {
@@ -289,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 );
@@ -343,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 ) {
@@ -369,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 ) {
@@ -412,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 ) {
@@ -444,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 ) {
@@ -484,16 +481,12 @@ 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]);
                }
        }
 
-       if( argc - optind != 1 ) {
-               usage( argv[0] );
-       } 
-
        if (authmethod == -1) {
 #ifdef HAVE_CYRUS_SASL
                authmethod = LDAP_AUTH_SASL;
@@ -502,15 +495,21 @@ main( int argc, char *argv[] )
 #endif
        }
 
-       dn = strdup( argv[optind] );
+       if( argc - optind > 1 ) {
+               usage( argv[0] );
+       } else if ( argc - optind == 1 ) {
+               user = strdup( argv[optind] );
+       } else {
+               user = NULL;
+       }
 
        if( want_oldpw && oldpw == NULL ) {
                /* prompt for old password */
                char *ckoldpw;
-               newpw = strdup(getpassphrase("Old password: "));
+               oldpw = strdup(getpassphrase("Old password: "));
                ckoldpw = getpassphrase("Re-enter old password: ");
 
-               if( newpw== NULL || ckoldpw == NULL ||
+               if( oldpw== NULL || ckoldpw == NULL ||
                        strncmp( oldpw, ckoldpw, strlen(oldpw) ))
                {
                        fprintf( stderr, "passwords do not match\n" );
@@ -532,19 +531,11 @@ main( int argc, char *argv[] )
                }
        }
 
-       if( binddn == NULL && dn != NULL ) {
-               binddn = dn;
-               dn = NULL;
-
-               if( passwd.bv_val == NULL ) {
-                       passwd.bv_val = oldpw;
-                       passwd.bv_len = oldpw == NULL ? 0 : strlen( oldpw );
-               }
-       }
-
        if (want_bindpw && passwd.bv_val == NULL ) {
                /* handle bind password */
-               fprintf( stderr, "Bind DN: %s\n", binddn );
+               if( binddn != NULL ) {
+                       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;
        }
@@ -569,20 +560,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 */
@@ -656,7 +652,7 @@ main( int argc, char *argv[] )
                }
        }
 
-       if( dn != NULL || oldpw != NULL || newpw != NULL ) {
+       if( user != NULL || oldpw != NULL || newpw != NULL ) {
                /* build change password control */
                BerElement *ber = ber_alloc_t( LBER_USE_DER );
 
@@ -668,10 +664,10 @@ main( int argc, char *argv[] )
 
                ber_printf( ber, "{" /*}*/ );
 
-               if( dn != NULL ) {
+               if( user != NULL ) {
                        ber_printf( ber, "ts",
-                               LDAP_TAG_EXOP_X_MODIFY_PASSWD_ID, dn );
-                       free(dn);
+                               LDAP_TAG_EXOP_X_MODIFY_PASSWD_ID, user );
+                       free(user);
                }
 
                if( oldpw != NULL ) {