]> git.sur5r.net Git - openldap/blobdiff - clients/tools/ldappasswd.c
Add LDBM comment
[openldap] / clients / tools / ldappasswd.c
index 54b2b8290aa228e58773619559aab1509d19301d..a0265f4ebdc5fa9b8e7dbc0b48898c7fe9c20d0a 100644 (file)
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
 #include <ac/stdlib.h>
 
 #include <ac/ctype.h>
-#include <ac/signal.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
 #include <ac/unistd.h>
 
 #include <ldap.h>
-
+#include "lutil.h"
 #include "lutil_ldap.h"
 #include "ldap_defaults.h"
 
-static int     verbose = 0;
+#include "common.h"
+
+
+static char    *newpw = NULL;
+static char    *oldpw = NULL;
+static int   want_newpw = 0;
+static int   want_oldpw = 0;
 
-static void
-usage(const char *s)
+
+void
+usage( void )
 {
        fprintf(stderr,
-"Change the password of an LDAP entry\n\n"
-"usage: %s [options] dn\n"
-"      dn: the DN of the entry whose password must be changed\n"
+"Change password of an LDAP user\n\n"
+"usage: %s [options] [user]\n"
+"  user: the autentication identity, commonly a DN\n"
 "Password change options:\n"
-"      -a secret\told password\n"
-"      -A\t\tprompt for old password\n"
-"      -s secret\tnew password\n"
-"      -S\t\tprompt for new password\n"
-
-"Common options:\n"
-"      -d level\tdebugging level\n"
-"      -C\t\tchase referrals\n"
-"      -D binddn\tbind DN\n"
-"      -h host\t\tLDAP server (default: localhost)\n"
-"      -n\t\tmake no modifications\n"
-"      -O secprops\tSASL security properties\n"
-"      -p port\t\tport on LDAP server\n"
-"      -U user\t\tSASL authentication identity (username)\n"
-"      -v\t\tverbose mode\n"
-"      -w passwd\tbind password (for simple authentication)\n"
-"      -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\tissue Start TLS request (-ZZ to require successful response)\n"
-               , s );
-
+"  -a secret  old password\n"
+"  -A         prompt for old password\n"
+"  -s secret  new password\n"
+"  -S         prompt for new password\n"
+               , prog );
+       tool_common_usage();
        exit( EXIT_FAILURE );
 }
 
+
+const char options[] = "a:As:S"
+       "Cd:D:e:h:H:InO:p:QR:U:vVw:WxX:Y:Z";
+
 int
-main( int argc, char *argv[] )
+handle_private_option( int i )
 {
-       int rc;
-       char    *ldaphost = NULL;
-
-       char    *dn = NULL;
-       char    *binddn = NULL;
-
-       struct berval passwd = { 0, NULL };
-       char    *newpw = NULL;
-       char    *oldpw = NULL;
-
-       int             want_bindpw = 0;
-       int             want_newpw = 0;
-       int             want_oldpw = 0;
-
-       int             noupdates = 0;
-       int             i;
-       int             ldapport = 0;
-       int             debug = 0;
-       int             version = -1;
-       int             authmethod = -1;
-#ifdef HAVE_CYRUS_SASL
-       char            *sasl_authc_id = NULL;
-       char            *sasl_authz_id = NULL;
-       char            *sasl_mech = NULL;
-       char            *sasl_secprops = NULL;
-#endif
-       int             use_tls = 0;
-       int             referrals = 0;
-       LDAP           *ld;
-       struct berval *bv = NULL;
-
-       int id, code;
-       LDAPMessage *res;
-       char *matcheddn = NULL, *text = NULL, **refs = NULL;
-       char    *retoid = NULL;
-       struct berval *retdata = NULL;
+       switch ( i ) {
+#if 0
+               int             crit;
+               char    *control, *cvalue;
+       case 'E': /* passwd controls */
+               if( protocol == LDAP_VERSION2 ) {
+                       fprintf( stderr, "%s: -E incompatible with LDAPv%d\n",
+                                prog, protocol );
+                       exit( EXIT_FAILURE );
+               }
 
-       if (argc == 1)
-               usage (argv[0]);
+               /* should be extended to support comma separated list of
+                *      [!]key[=value] parameters, e.g.  -E !foo,bar=567
+                */
 
-       while( (i = getopt( argc, argv,
-               "Aa:Ss:" "Cd:D:h:nO:p:U:vw:WxX:Y:Z" )) != EOF )
-       {
-               switch (i) {
-               /* Password Options */
-               case 'A':       /* prompt for old password */
-                       want_oldpw++;
-                       break;
+               crit = 0;
+               cvalue = NULL;
+               if( optarg[0] == '!' ) {
+                       crit = 1;
+                       optarg++;
+               }
 
-               case 'a':       /* old password (secret) */
-                       oldpw = strdup (optarg);
+               control = strdup( optarg );
+               if ( (cvalue = strchr( control, '=' )) != NULL ) {
+                       *cvalue++ = '\0';
+               }
+               fprintf( stderr, "Invalid passwd control name: %s\n", control );
+               usage();
+#endif
 
-                       {
-                               char* p;
+       case 'a':       /* old password (secret) */
+               oldpw = strdup (optarg);
 
-                               for( p = optarg; *p == '\0'; p++ ) {
-                                       *p = '*';
-                               }
+               {
+                       char* p;
+                       for( p = optarg; *p != '\0'; p++ ) {
+                               *p = '\0';
                        }
-                       break;
-
-               case 'S':       /* prompt for user password */
-                       want_newpw++;
-                       break;
+               }
+               break;
 
-               case 's':       /* new password (secret) */
-                       newpw = strdup (optarg);
-                       {
-                               char* p;
+       case 'A':       /* prompt for old password */
+               want_oldpw++;
+               break;
 
-                               for( p = optarg; *p == '\0'; p++ ) {
-                                       *p = '*';
-                               }
+       case 's':       /* new password (secret) */
+               newpw = strdup (optarg);
+               {
+                       char* p;
+                       for( p = optarg; *p != '\0'; p++ ) {
+                               *p = '\0';
                        }
-                       break;
-
-               /* Common Options */
-               case 'C':
-                       referrals++;
-                       break;
+               }
+               break;
 
-               case 'D':       /* bind distinguished name */
-                       binddn = strdup (optarg);
-                       break;
+       case 'S':       /* prompt for user password */
+               want_newpw++;
+               break;
 
-               case 'd':       /* debugging option */
-                       debug |= atoi (optarg);
-                       break;
+       default:
+               return 0;
+       }
+       return 1;
+}
 
-               case 'h':       /* ldap host */
-                       ldaphost = strdup (optarg);
-                       break;
 
-               case 'n':       /* don't update entry(s) */
-                       noupdates++;
-                       break;
+int
+main( int argc, char *argv[] )
+{
+       int rc;
+       char    *user = NULL;
 
-               case 'p':       /* ldap port */
-                       ldapport = strtol( optarg, NULL, 10 );
-                       break;
+       LDAP           *ld = NULL;
+       struct berval bv = {0, NULL};
+       BerElement  *ber = NULL;
 
-               case 'v':       /* verbose */
-                       verbose++;
-                       break;
+       int id, code = LDAP_OTHER;
+       LDAPMessage *res;
+       char *matcheddn = NULL, *text = NULL, **refs = NULL;
+       char    *retoid = NULL;
+       struct berval *retdata = NULL;
 
-               case 'W':       /* prompt for bind password */
-                       want_bindpw++;
-                       break;
+       prog = lutil_progname( "ldappasswd", argc, argv );
 
-               case 'w':       /* bind password */
-                       passwd.bv_val = strdup (optarg);
-                       {
-                               char* p;
+       /* LDAPv3 only */
+       protocol = LDAP_VERSION3;
 
-                               for( p = optarg; *p == '\0'; p++ ) {
-                                       *p = '*';
-                               }
-                       }
-                       passwd.bv_len = strlen( passwd.bv_val );
-                       break;
-
-               case 'O':
-#ifdef HAVE_CYRUS_SASL
-                       sasl_secprops = strdup( optarg );
-                       authmethod = LDAP_AUTH_SASL;
-#else
-                       fprintf( stderr, "%s was not compiled with SASL support\n",
-                               argv[0] );
-                       return( EXIT_FAILURE );
-#endif
-                       break;
-               case 'Y':
-#ifdef HAVE_CYRUS_SASL
-                       if ( strcasecmp( optarg, "any" ) &&
-                                       strcmp( optarg, "*" ) ) {
-                               sasl_mech = strdup( optarg );
-                       }
-                       authmethod = LDAP_AUTH_SASL;
-#else
-                       fprintf( stderr, "%s was not compiled with SASL "
-                               "support\n", argv[0] );
-                       return( EXIT_FAILURE );
-#endif
-                       break;
-               case 'U':
-#ifdef HAVE_CYRUS_SASL
-                       sasl_authc_id = strdup( optarg );
-                       authmethod = LDAP_AUTH_SASL;
-#else
-                       fprintf( stderr, "%s was not compiled with SASL "
-                               "support\n", argv[0] );
-                       return( EXIT_FAILURE );
-#endif
-                       break;
-               case 'X':
-#ifdef HAVE_CYRUS_SASL
-                       sasl_authz_id = strdup( optarg );
-                       authmethod = LDAP_AUTH_SASL;
-#else
-                       fprintf( stderr, "%s was not compiled with SASL "
-                               "support\n", argv[0] );
-                       return( EXIT_FAILURE );
-#endif
-                       break;
-               case 'Z':
-#ifdef HAVE_TLS
-                       use_tls++;
-#else
-                       fprintf( stderr, "%s was not compiled with TLS "
-                               "support\n", argv[0] );
-                       return( EXIT_FAILURE );
-#endif
-                       break;
+       tool_args( argc, argv );
 
-               default:
-                       usage (argv[0]);
-               }
+       if( argc - optind > 1 ) {
+               usage();
+       } else if ( argc - optind == 1 ) {
+               user = strdup( argv[optind] );
+       } else {
+               user = NULL;
        }
 
-       if( argc - optind != 1 ) {
-               usage( argv[0] );
-       } 
-
-       dn = strdup( argv[optind] );
-
        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 ||
-                       strncmp( oldpw, ckoldpw, strlen(oldpw) ))
+               if( oldpw== NULL || ckoldpw == NULL ||
+                       strcmp( oldpw, ckoldpw ))
                {
                        fprintf( stderr, "passwords do not match\n" );
                        return EXIT_FAILURE;
@@ -266,115 +172,29 @@ main( int argc, char *argv[] )
                cknewpw = getpassphrase("Re-enter new password: ");
 
                if( newpw== NULL || cknewpw == NULL ||
-                       strncmp( newpw, cknewpw, strlen(newpw) ))
+                       strcmp( newpw, cknewpw ))
                {
                        fprintf( stderr, "passwords do not match\n" );
                        return EXIT_FAILURE;
                }
        }
 
-       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 );
                passwd.bv_val = strdup( getpassphrase("Enter bind password: "));
                passwd.bv_len = passwd.bv_val ? strlen( passwd.bv_val ) : 0;
        }
 
-       if ( debug ) {
-               if( ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug ) != LBER_OPT_SUCCESS ) {
-                       fprintf( stderr, "Could not set LBER_OPT_DEBUG_LEVEL %d\n", debug );
-               }
-               if( ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug ) != LDAP_OPT_SUCCESS ) {
-                       fprintf( stderr, "Could not set LDAP_OPT_DEBUG_LEVEL %d\n", debug );
-               }
-       }
-
-#ifdef SIGPIPE
-       (void) SIGNAL( SIGPIPE, SIG_IGN );
-#endif
+       ld = tool_conn_setup( 0, 0 );
 
-       /* connect to server */
-       if ((ld = ldap_init( ldaphost, ldapport )) == NULL) {
-               perror("ldap_init");
-               return EXIT_FAILURE;
-       }
+       tool_bind( ld );
 
-       /* referrals */
-       if (ldap_set_option( ld, LDAP_OPT_REFERRALS,
-               referrals ? LDAP_OPT_ON : LDAP_OPT_OFF ) != LDAP_OPT_SUCCESS )
-       {
-               fprintf( stderr, "Could not set LDAP_OPT_REFERRALS %s\n",
-                       referrals ? "on" : "off" );
-               return EXIT_FAILURE;
-       }
+       if ( authzid || manageDSAit || noop )
+               tool_server_controls( ld, NULL, 0 );
 
-       /* LDAPv3 only */
-       version = 3;
-       rc = ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version );
-
-       if(rc != LDAP_OPT_SUCCESS ) {
-               fprintf( stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n", version );
-               return EXIT_FAILURE;
-       }
-
-       if ( use_tls && ldap_start_tls_s( ld, NULL, NULL ) != LDAP_SUCCESS ) {
-               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 ) {
-#ifdef HAVE_CYRUS_SASL
-               ldap_set_sasl_interact_proc( ld, lutil_sasl_interact );
-
-               if( sasl_secprops != NULL ) {
-                       rc = ldap_set_option( ld, LDAP_OPT_X_SASL_SECPROPS,
-                               (void *) sasl_secprops );
-                       
-                       if( rc != LDAP_OPT_SUCCESS ) {
-                               fprintf( stderr,
-                                       "Could not set LDAP_OPT_X_SASL_SECPROPS: %s\n",
-                                       sasl_secprops );
-                               return( EXIT_FAILURE );
-                       }
-               }
-               
-               rc = ldap_sasl_interactive_bind_s( ld, binddn,
-                               sasl_mech, NULL, NULL );
-
-               if( rc != LDAP_SUCCESS ) {
-                       ldap_perror( ld, "ldap_sasl_interactive_bind_s" );
-                       return( EXIT_FAILURE );
-               }
-#else
-               fprintf( stderr, "%s was not compiled with SASL support\n",
-                       argv[0] );
-               return( EXIT_FAILURE );
-#endif
-       }
-       else {
-               if ( ldap_bind_s( ld, binddn, passwd.bv_val, authmethod )
-                               != LDAP_SUCCESS ) {
-                       ldap_perror( ld, "ldap_bind" );
-                       return( EXIT_FAILURE );
-               }
-       }
-
-       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 );
+               ber = ber_alloc_t( LBER_USE_DER );
 
                if( ber == NULL ) {
                        perror( "ber_alloc_t" );
@@ -384,47 +204,45 @@ 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_MODIFY_PASSWD_ID, user );
+                       free(user);
                }
 
                if( oldpw != NULL ) {
                        ber_printf( ber, "ts",
-                               LDAP_TAG_EXOP_X_MODIFY_PASSWD_NEW, oldpw );
+                               LDAP_TAG_EXOP_MODIFY_PASSWD_OLD, oldpw );
                        free(oldpw);
                }
 
                if( newpw != NULL ) {
                        ber_printf( ber, "ts",
-                               LDAP_TAG_EXOP_X_MODIFY_PASSWD_NEW, newpw );
+                               LDAP_TAG_EXOP_MODIFY_PASSWD_NEW, newpw );
                        free(newpw);
                }
 
                ber_printf( ber, /*{*/ "N}" );
 
-               rc = ber_flatten( ber, &bv );
+               rc = ber_flatten2( ber, &bv, 0 );
 
                if( rc < 0 ) {
-                       perror( "ber_flatten" );
+                       perror( "ber_flatten2" );
                        ldap_unbind( ld );
                        return EXIT_FAILURE;
                }
-
-               ber_free( ber, 1 );
        }
 
-       if ( noupdates ) {
+       if ( not ) {
                rc = LDAP_SUCCESS;
                goto skip;
        }
 
        rc = ldap_extended_operation( ld,
-               LDAP_EXOP_X_MODIFY_PASSWD, bv
+               LDAP_EXOP_MODIFY_PASSWD, bv.bv_val ? &bv : NULL
                NULL, NULL, &id );
 
-       ber_bvfree( bv );
+       ber_free( ber, 1 );
 
        if( rc != LDAP_SUCCESS ) {
                ldap_perror( ld, "ldap_extended_operation" );
@@ -455,7 +273,7 @@ main( int argc, char *argv[] )
        if( retdata != NULL ) {
                ber_tag_t tag;
                char *s;
-               BerElement *ber = ber_init( retdata );
+               ber = ber_init( retdata );
 
                if( ber == NULL ) {
                        perror( "ber_init" );
@@ -505,5 +323,5 @@ skip:
        /* disconnect from server */
        ldap_unbind (ld);
 
-       return EXIT_SUCCESS;
+       return code == LDAP_SUCCESS ? EXIT_SUCCESS : EXIT_FAILURE;
 }