X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=clients%2Ftools%2Fldappasswd.c;h=b0cdfb6dea4f8d95883831cfb412320d78be8b8e;hb=fd4b8ba0cd8c1aedb91837d36cfaafac3a64a735;hp=d5d18e36bd675ecfec28a7acc559590a608008d1;hpb=6d113f53a01dff44dd8e97bfad87ef6229e2e4b2;p=openldap

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index d5d18e36bd..b0cdfb6dea 100644
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -1,402 +1,789 @@
+/* $OpenLDAP$ */
 /*
- *	Copyright 1998, David E. Storey, All rights reserved.
- *	This software is not subject to any license of The Murphy Group, Inc.
- *	or George Mason University.
- *
- *	Redistribution and use in source and binary forms are permitted only
- *	as authorized by the OpenLDAP Public License.  A copy of this
- *	license is available at http://www.OpenLDAP.org/license.html or
- *	in file LICENSE in the top-level directory of the distribution.
- *
- *	ldappasswd.c - program to modify passwords in an LDAP tree
- *
- *	Author: David E. Storey <dave@tamos.net>
- *
- *	ToDo: option for referral handling
- *		cracklib support?
- *		kerberos support? (is this really necessary?)
- *		update "shadow" fields?
- *		create/view/change password policies?
- *
- *      Note: I am totally FOR comments and suggestions!
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <sys/time.h>
 
+#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 <lber.h>
 #include <ldap.h>
-#include <lutil.h>
-#include <lutil_md5.h>
-#include <lutil_sha1.h>
-
-#include "ldapconfig.h"
-
-#define LDAP_PASSWD_ATTRIB "userPassword"
-
-typedef enum {
-	HASHTYPE_NONE,
-	HASHTYPE_CRYPT,
-	HASHTYPE_MD5,
-	HASHTYPE_SHA1
-} HashTypes;
-
-struct hash_t {
-	char *name;
-	int namesz;
-	int (*func)(const char *, char *);
-	HashTypes type;
-};
-
-const char crypt64[] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789./";
-char	 *base = NULL;
-char	 *binddn = NULL;
-char	 *bindpw = NULL;
-char	 *ldaphost = "localhost";
-char	 *pwattr = LDAP_PASSWD_ATTRIB;
-char	 *targetdn = NULL;
-char	 *filtpattern = NULL;
-int	  ldapport = LDAP_PORT;
-int	  noupdates = 0;
-int	  verbose = 0;
-int	  hashtype = HASHTYPE_CRYPT;
-int	  scope = LDAP_SCOPE_SUBTREE;
-
-/*** functions ***/
 
-/*
- * if you'd like to write a better salt generator, please, be my guest.
- * I just needed *something*. It's actually halfway effective for small,
- * two character salts and it can come up with sequentially different
- * salts.
- */
+#include "lutil_ldap.h"
+#include "ldap_defaults.h"
 
-void
-crypt_make_salt(char *salt)
-{
-	struct timeval tv;
-	int i;
-	char t_salt[5];
-
-	/* grab current time */
-	gettimeofday(&tv, (struct timezone *) 0);
-	i += tv.tv_usec + (int)&salt;
-	strncpy(t_salt, (char *)&i, sizeof(i));
-
-	for (i = 0; i < sizeof(i); i++)
-		salt[i] = crypt64[t_salt[i] % (sizeof(crypt64) - 1)];
-	salt[i] = '\0';
-}
+static int	verbose = 0;
 
-int
-hash_none(const char *pw_in, char *pw_out)
+static void
+usage(const char *s)
 {
-	strcpy(pw_out, pw_in);
-	return(1);
+	fprintf(stderr,
+"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  old password\n"
+"  -A         prompt for old password\n"
+"  -s secret  new password\n"
+"  -S         prompt for new password\n"
+
+"Common options:\n"
+"  -d level   set LDAP debugging level to `level'\n"
+"  -D binddn  bind DN\n"
+"  -f file    read operations from `file'\n"
+"  -h host    LDAP server(s)\n"
+"  -H URI     LDAP Uniform Resource Indentifier(s)\n"
+"  -I         use SASL Interactive mode\n"
+"  -n         show what would be done but don't actually search\n"
+"  -O props   SASL security properties\n"
+"  -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"
+"  -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"
+"  -Y mech    SASL mechanism\n"
+"  -Z         Start TLS request (-ZZ to require successful response)\n"
+		, s );
+
+	exit( EXIT_FAILURE );
 }
 
 int
-hash_crypt(const char *pw_in, char *pw_out)
+main( int argc, char *argv[] )
 {
-	char salt[5];
-	crypt_make_salt(salt);
-	strcpy(pw_out, crypt(pw_in, salt));
-	return(1);
-}
+	int rc;
+	char	*prog = NULL;
+	char	*ldaphost = NULL;
+	char	*ldapuri = NULL;
+
+	char	*user = 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		not = 0;
+	int		i;
+	int		ldapport = 0;
+	int		debug = 0;
+	int		version = -1;
+	int		authmethod = -1;
+	int		manageDSAit = 0;
+#ifdef HAVE_CYRUS_SASL
+	unsigned	sasl_flags = LDAP_SASL_AUTOMATIC;
+	char		*sasl_realm = NULL;
+	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 = NULL;
+	struct berval *bv = NULL;
 
-int
-hash_md5(const char *pw_in, char *pw_out)
-{
-	lutil_MD5_CTX MD5context;
-	unsigned char MD5digest[16];
-	char base64digest[25];  /* ceiling(sizeof(input)/3) * 4 + 1 */
-
-	lutil_MD5Init(&MD5context);
-	lutil_MD5Update(&MD5context, (unsigned char *)pw_in, strlen(pw_in));
-	lutil_MD5Final(MD5digest, &MD5context);
-	if (lutil_b64_ntop(MD5digest, sizeof(MD5digest), base64digest, sizeof(base64digest)) < 0)
-		return (0);
-
-	strcpy(pw_out, base64digest);
-	return(1);
-}
+	int id, code;
+	LDAPMessage *res;
+	char *matcheddn = NULL, *text = NULL, **refs = NULL;
+	char	*retoid = NULL;
+	struct berval *retdata = NULL;
 
-int
-hash_sha1(const char *pw_in, char *pw_out)
-{
-	lutil_SHA1_CTX SHA1context;
-	unsigned char SHA1digest[20];
-	char base64digest[29];  /* ceiling(sizeof(input)/3) * 4 + 1 */
-
-	lutil_SHA1Init(&SHA1context);
-	lutil_SHA1Update(&SHA1context, (unsigned char *)pw_in, strlen(pw_in));
-	lutil_SHA1Final(SHA1digest, &SHA1context);
-	if (lutil_b64_ntop(SHA1digest, sizeof(SHA1digest), base64digest, sizeof(base64digest)) < 0)
-		return(0);
-
-	strcpy(pw_out, base64digest);
-	return(1);
-}
-
-static struct hash_t hashes[] = {
-	{"none",  4, hash_none,  HASHTYPE_NONE},
-	{"crypt", 5, hash_crypt, HASHTYPE_CRYPT},
-	{"md5",   3, hash_md5,   HASHTYPE_MD5},
-	{"sha",   3, hash_sha1,  HASHTYPE_SHA1},
-	{NULL,    0, NULL,       HASHTYPE_NONE}
-};
+    prog = (prog = strrchr(argv[0], *LDAP_DIRSEP)) == NULL ? argv[0] : prog + 1;
 
-int
-modify_dn(LDAP *ld, char *targetdn, char *newpw)
-{
-	int ret = 0;
-	char hashed_pw[128] = {'\0'};
-	char buf[128] = {'\0'};
-	char *strvals[2] = {buf, NULL};
-	LDAPMod mod, *mods[2] = {&mod, NULL};
-
-	if (!ld || !targetdn || !newpw)
-		return(1);
-
-	/* hash password */
-	hashes[hashtype].func(newpw, hashed_pw);
-	if (hashtype)
-		sprintf(buf, "{%s}%s", hashes[hashtype].name, hashed_pw);
-	else
-		sprintf(buf, "%s", hashed_pw);
-
-	if (verbose > 0)
+	while( (i = getopt( argc, argv, "Aa:Ss:"
+		"Cd:D:h:H:InO:p:QR:U:vw:WxX:Y:Z" )) != EOF )
 	{
-		printf("%s", targetdn);
-		if (verbose > 1)
-		{
-			printf(":%s", buf);
-			if (verbose > 2)
-				printf(":%s", newpw);
-		}
-		printf("\n");
-	}
-
-	mod.mod_vals.modv_strvals = strvals;
-	mod.mod_type = pwattr;
-	mod.mod_op = LDAP_MOD_REPLACE;
-
-	if (!noupdates && (ret = ldap_modify_s(ld, targetdn, mods)) != LDAP_SUCCESS)
-		ldap_perror(ld, "ldap_modify_s");
-	return(ret);
-}
-
-void
-usage(char *s)
-{
-	fprintf(stderr, "usage: %s [options] [filter]\n", s);
-	fprintf(stderr, "\t-a attrib   password attribute (default: userPassword)\n");
-	fprintf(stderr, "\t-b basedn   basedn to perform searches\n");
-	fprintf(stderr, "\t-c hash     hash type: none, crypt, md5, sha (default: crypt)\n");
-	fprintf(stderr, "\t-D binddn   bind dn\n");
-	fprintf(stderr, "\t-d level    debugging level\n");
-	fprintf(stderr, "\t-h host     ldap server (default: localhost)\n");
-	fprintf(stderr, "\t-l time     time limit\n");
-	fprintf(stderr, "\t-n          make no modifications\n");
-	fprintf(stderr, "\t-p port     ldap port\n");
-	fprintf(stderr, "\t-s scope    search scope: base, one, sub (default: sub)\n");
-	fprintf(stderr, "\t-t targetdn dn to change password\n");
-	fprintf(stderr, "\t-W newpass  new password\n");
-	fprintf(stderr, "\t-w [passwd] bind password (for simple authentication)\n");
-	fprintf(stderr, "\t-v          verbose\n");
-	fprintf(stderr, "\t-z size     size limit\n");
-	exit(1);
-}
-
-int
-main(int argc, char *argv[])
-{
-	char *newpw = NULL;
-	int i, j;
-	int sizelimit = LDAP_NO_LIMIT;
-	int timelimit = LDAP_NO_LIMIT;
-	int want_bindpw = 0;
-	LDAP *ld;
-
-	while ((i = getopt(argc, argv, "D:W:a:b:c:d:h:l:np:s:t:vw::z:")) != EOF)
-	{
-		switch(i)
-		{
-		case 'D':	   /* bind distinguished name */
-			binddn = strdup(optarg);
+		switch (i) {
+		/* Password Options */
+		case 'A':	/* prompt for old password */
+			want_oldpw++;
 			break;
 
-		case 'W':	   /* new password */
-                        newpw = strdup(optarg);
-			break;
+		case 'a':	/* old password (secret) */
+			oldpw = strdup (optarg);
+
+			{
+				char* p;
 
-		case 'a':	   /* password attribute */
-                        pwattr = strdup(optarg);
+				for( p = optarg; *p == '\0'; p++ ) {
+					*p = '\0';
+				}
+			}
 			break;
 
-		case 'b':	   /* base search dn */
-                        base = strdup(optarg);
+		case 'S':	/* prompt for user password */
+			want_newpw++;
 			break;
 
-		case 'c':	   /* hashes */
-			for (j = 0; hashes[j].name; j++)
+		case 's':	/* new password (secret) */
+			newpw = strdup (optarg);
 			{
-				if (!strncasecmp(optarg, hashes[j].name, hashes[j].namesz))
-				{
-					hashtype = hashes[j].type;
-					break;
-				}
-			}
+				char* p;
 
-			if (!hashes[j].name)
-			{
-				fprintf(stderr, "hash type: %s is unknown\n", optarg);
-				usage(argv[0]);
+				for( p = optarg; *p == '\0'; p++ ) {
+					*p = '\0';
+				}
 			}
 			break;
 
-		case 'd':	   /* debugging option */
-#ifdef LDAP_DEBUG
-			ldap_debug = lber_debug = atoi(optarg);   /* */
+	/* Common Options (including options we don't use) */
+	case 'C':
+		referrals++;
+		break;
+	case 'd':
+	    debug |= atoi( optarg );
+	    break;
+	case 'D':	/* bind DN */
+		if( binddn != NULL ) {
+			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", prog );
+			return EXIT_FAILURE;
+		}
+		if( ldaphost != NULL ) {
+			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", prog );
+			return EXIT_FAILURE;
+		}
+		if( ldapport ) {
+			fprintf( stderr, "%s: -H incompatible with -p\n", prog );
+			return EXIT_FAILURE;
+		}
+		if( ldapuri != NULL ) {
+			fprintf( stderr, "%s: -H previously specified\n", prog );
+			return EXIT_FAILURE;
+		}
+	    ldapuri = strdup( optarg );
+	    break;
+	case 'I':
+#ifdef HAVE_CYRUS_SASL
+		if( version == LDAP_VERSION2 ) {
+			fprintf( stderr, "%s: -I incompatible with version %d\n",
+				prog, version );
+			return EXIT_FAILURE;
+		}
+		if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) {
+			fprintf( stderr, "%s: incompatible previous "
+				"authentication choice\n",
+				prog );
+			return EXIT_FAILURE;
+		}
+		authmethod = LDAP_AUTH_SASL;
+		version = LDAP_VERSION3;
+		sasl_flags = LDAP_SASL_INTERACTIVE;
+		break;
 #else
-			fprintf(stderr, "compile with -DLDAP_DEBUG for debugging\n");
+		fprintf( stderr, "%s: was not compiled with SASL support\n",
+			prog );
+		return( EXIT_FAILURE );
 #endif
-			break;
-
-		case 'h':	   /* ldap host */
-                        ldaphost = strdup(optarg);
-			break;
-
-		case 'l':	   /* time limit */
-                        timelimit = strtol(optarg, NULL, 10);
-			break;
-
-		case 'n':	   /* don't update entry(s) */
-			noupdates++;
-			break;
+	case 'k':	/* kerberos bind */
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
+		if( version > LDAP_VERSION2 ) {
+			fprintf( stderr, "%s: -k incompatible with LDAPv%d\n",
+				prog, version );
+			return EXIT_FAILURE;
+		}
 
-		case 'p':	   /* ldap port */
-			ldapport = strtol(optarg, NULL, 10);
-			break;
+		if( authmethod != -1 ) {
+			fprintf( stderr, "%s: -k incompatible with previous "
+				"authentication choice\n", prog );
+			return EXIT_FAILURE;
+		}
+			
+		authmethod = LDAP_AUTH_KRBV4;
+#else
+		fprintf( stderr, "%s: not compiled with Kerberos support\n", prog );
+		return EXIT_FAILURE;
+#endif
+	    break;
+	case 'K':	/* kerberos bind, part one only */
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
+		if( version > LDAP_VERSION2 ) {
+			fprintf( stderr, "%s: -k incompatible with LDAPv%d\n",
+				prog, version );
+			return EXIT_FAILURE;
+		}
+		if( authmethod != -1 ) {
+			fprintf( stderr, "%s: incompatible with previous "
+				"authentication choice\n", prog );
+			return EXIT_FAILURE;
+		}
 
-		case 's':	   /* scope */
-			if (strncasecmp(optarg, "base", 4) == 0)
-				scope = LDAP_SCOPE_BASE;
-			else if (strncasecmp(optarg, "one", 3) == 0)
-				scope = LDAP_SCOPE_ONELEVEL;
-			else if (strncasecmp(optarg, "sub", 3) == 0)
-				scope = LDAP_SCOPE_SUBTREE;
-			else {
-				fprintf(stderr, "scope should be base, one, or sub\n" );
-				usage(argv[0]);
+		authmethod = LDAP_AUTH_KRBV41;
+#else
+		fprintf( stderr, "%s: not compiled with Kerberos support\n", prog );
+		return( EXIT_FAILURE );
+#endif
+	    break;
+	case 'M':
+		/* enable Manage DSA IT */
+		if( version == LDAP_VERSION2 ) {
+			fprintf( stderr, "%s: -M incompatible with LDAPv%d\n",
+				prog, version );
+			return EXIT_FAILURE;
+		}
+		manageDSAit++;
+		version = LDAP_VERSION3;
+		break;
+	case 'n':	/* print deletes, don't actually do them */
+	    ++not;
+	    break;
+	case 'O':
+#ifdef HAVE_CYRUS_SASL
+		if( sasl_secprops != NULL ) {
+			fprintf( stderr, "%s: -O previously specified\n", prog );
+			return EXIT_FAILURE;
+		}
+		if( version == LDAP_VERSION2 ) {
+			fprintf( stderr, "%s: -O incompatible with LDAPv%d\n",
+				prog, version );
+			return EXIT_FAILURE;
+		}
+		if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) {
+			fprintf( stderr, "%s: incompatible previous "
+				"authentication choice\n", prog );
+			return EXIT_FAILURE;
+		}
+		authmethod = LDAP_AUTH_SASL;
+		version = LDAP_VERSION3;
+		sasl_secprops = strdup( optarg );
+#else
+		fprintf( stderr, "%s: not compiled with SASL support\n",
+			prog );
+		return( EXIT_FAILURE );
+#endif
+		break;
+	case 'p':
+		if( ldapport ) {
+			fprintf( stderr, "%s: -p previously specified\n", prog );
+			return EXIT_FAILURE;
+		}
+	    ldapport = atoi( optarg );
+	    break;
+	case 'P':
+		switch( atoi(optarg) ) {
+		case 2:
+			if( version == LDAP_VERSION3 ) {
+				fprintf( stderr, "%s: -P 2 incompatible with version %d\n",
+					prog, version );
+				return EXIT_FAILURE;
 			}
+			version = LDAP_VERSION2;
 			break;
-
-		case 't':	   /* target dn */
-                        targetdn = strdup(optarg);
-			break;
-
-		case 'v':	   /* verbose */
-			verbose++;
+		case 3:
+			if( version == LDAP_VERSION2 ) {
+				fprintf( stderr, "%s: -P 2 incompatible with version %d\n",
+					prog, version );
+				return EXIT_FAILURE;
+			}
+			version = LDAP_VERSION3;
 			break;
+		default:
+			fprintf( stderr, "%s: protocol version should be 2 or 3\n",
+				prog );
+			usage( prog );
+			return( EXIT_FAILURE );
+		} break;
+	case 'Q':
+#ifdef HAVE_CYRUS_SASL
+		if( version == LDAP_VERSION2 ) {
+			fprintf( stderr, "%s: -Q incompatible with version %d\n",
+				prog, version );
+			return EXIT_FAILURE;
+		}
+		if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) {
+			fprintf( stderr, "%s: incompatible previous "
+				"authentication choice\n",
+				prog );
+			return EXIT_FAILURE;
+		}
+		authmethod = LDAP_AUTH_SASL;
+		version = LDAP_VERSION3;
+		sasl_flags = LDAP_SASL_QUIET;
+		break;
+#else
+		fprintf( stderr, "%s: not compiled with SASL support\n",
+			prog );
+		return( EXIT_FAILURE );
+#endif
+	case 'R':
+#ifdef HAVE_CYRUS_SASL
+		if( sasl_realm != NULL ) {
+			fprintf( stderr, "%s: -R previously specified\n", prog );
+			return EXIT_FAILURE;
+		}
+		if( version == LDAP_VERSION2 ) {
+			fprintf( stderr, "%s: -R incompatible with version %d\n",
+				prog, version );
+			return EXIT_FAILURE;
+		}
+		if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) {
+			fprintf( stderr, "%s: incompatible previous "
+				"authentication choice\n",
+				prog );
+			return EXIT_FAILURE;
+		}
+		authmethod = LDAP_AUTH_SASL;
+		version = LDAP_VERSION3;
+		sasl_realm = strdup( optarg );
+#else
+		fprintf( stderr, "%s: not compiled with SASL support\n",
+			prog );
+		return( EXIT_FAILURE );
+#endif
+		break;
+	case 'U':
+#ifdef HAVE_CYRUS_SASL
+		if( sasl_authc_id != NULL ) {
+			fprintf( stderr, "%s: -U previously specified\n", prog );
+			return EXIT_FAILURE;
+		}
+		if( version == LDAP_VERSION2 ) {
+			fprintf( stderr, "%s: -U incompatible with version %d\n",
+				prog, version );
+			return EXIT_FAILURE;
+		}
+		if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) {
+			fprintf( stderr, "%s: incompatible previous "
+				"authentication choice\n",
+				prog );
+			return EXIT_FAILURE;
+		}
+		authmethod = LDAP_AUTH_SASL;
+		version = LDAP_VERSION3;
+		sasl_authc_id = strdup( optarg );
+#else
+		fprintf( stderr, "%s: not compiled with SASL support\n",
+			prog );
+		return( EXIT_FAILURE );
+#endif
+		break;
+	case 'v':	/* verbose mode */
+	    verbose++;
+	    break;
+	case 'w':	/* password */
+	    passwd.bv_val = strdup( optarg );
+		{
+			char* p;
 
-                case 'w':	   /* bind password */
-			if (optarg)
-				bindpw = strdup(optarg);
-			else
-				want_bindpw++;
-                    break;
+			for( p = optarg; *p == '\0'; p++ ) {
+				*p = '\0';
+			}
+		}
+		passwd.bv_len = strlen( passwd.bv_val );
+	    break;
+	case 'W':
+		want_bindpw++;
+		break;
+	case 'Y':
+#ifdef HAVE_CYRUS_SASL
+		if( sasl_mech != NULL ) {
+			fprintf( stderr, "%s: -Y previously specified\n", prog );
+			return EXIT_FAILURE;
+		}
+		if( version == LDAP_VERSION2 ) {
+			fprintf( stderr, "%s: -Y incompatible with version %d\n",
+				prog, version );
+			return EXIT_FAILURE;
+		}
+		if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) {
+			fprintf( stderr, "%s: incompatible with authentication choice\n", prog );
+			return EXIT_FAILURE;
+		}
+		authmethod = LDAP_AUTH_SASL;
+		version = LDAP_VERSION3;
+		sasl_mech = strdup( optarg );
+#else
+		fprintf( stderr, "%s: not compiled with SASL support\n",
+			prog );
+		return( EXIT_FAILURE );
+#endif
+		break;
+	case 'x':
+		if( authmethod != -1 && authmethod != LDAP_AUTH_SIMPLE ) {
+			fprintf( stderr, "%s: incompatible with previous "
+				"authentication choice\n", prog );
+			return EXIT_FAILURE;
+		}
+		authmethod = LDAP_AUTH_SIMPLE;
+		break;
+	case 'X':
+#ifdef HAVE_CYRUS_SASL
+		if( sasl_authz_id != NULL ) {
+			fprintf( stderr, "%s: -X previously specified\n", prog );
+			return EXIT_FAILURE;
+		}
+		if( version == LDAP_VERSION2 ) {
+			fprintf( stderr, "%s: -X incompatible with LDAPv%d\n",
+				prog, version );
+			return EXIT_FAILURE;
+		}
+		if( authmethod != -1 && authmethod != LDAP_AUTH_SASL ) {
+			fprintf( stderr, "%s: -X incompatible with "
+				"authentication choice\n", prog );
+			return EXIT_FAILURE;
+		}
+		authmethod = LDAP_AUTH_SASL;
+		version = LDAP_VERSION3;
+		sasl_authz_id = strdup( optarg );
+#else
+		fprintf( stderr, "%s: not compiled with SASL support\n",
+			prog );
+		return( EXIT_FAILURE );
+#endif
+		break;
+	case 'Z':
+#ifdef HAVE_TLS
+		if( version == LDAP_VERSION2 ) {
+			fprintf( stderr, "%s: -Z incompatible with version %d\n",
+				prog, version );
+			return EXIT_FAILURE;
+		}
+		version = LDAP_VERSION3;
+		use_tls++;
+#else
+		fprintf( stderr, "%s: not compiled with TLS support\n",
+			prog );
+		return( EXIT_FAILURE );
+#endif
+		break;
 
-		case 'z':	   /* time limit */
-			sizelimit = strtol(optarg, NULL, 10);
-			break;
 
 		default:
-			usage(argv[0]);
+			fprintf( stderr, "%s: unrecognized option -%c\n",
+				prog, optopt );
+			usage (argv[0]);
 		}
 	}
 
-	/* grab filter */
-	if (!(argc - optind < 1))
-		filtpattern = strdup(argv[optind]);
+	if (authmethod == -1) {
+#ifdef HAVE_CYRUS_SASL
+		authmethod = LDAP_AUTH_SASL;
+#else
+		authmethod = LDAP_AUTH_SIMPLE;
+#endif
+	}
 
-	/* check for target(s) */
-	if (!filtpattern && !targetdn)
-		targetdn = binddn;
+	if( argc - optind > 1 ) {
+		usage( argv[0] );
+	} else if ( argc - optind == 1 ) {
+		user = strdup( argv[optind] );
+	} else {
+		user = NULL;
+	}
 
-	/* handle bind password */
-	if (want_bindpw)
-		bindpw = strdup(getpass("Enter LDAP password: "));
+	if( want_oldpw && oldpw == NULL ) {
+		/* prompt for old password */
+		char *ckoldpw;
+		oldpw = strdup(getpassphrase("Old password: "));
+		ckoldpw = getpassphrase("Re-enter old password: ");
 
-	/* handle new password */
-	if (!newpw)
-	{
+		if( oldpw== NULL || ckoldpw == NULL ||
+			strncmp( oldpw, ckoldpw, strlen(oldpw) ))
+		{
+			fprintf( stderr, "passwords do not match\n" );
+			return EXIT_FAILURE;
+		}
+	}
+
+	if( want_newpw && newpw == NULL ) {
+		/* prompt for new password */
 		char *cknewpw;
-		newpw = strdup(getpass("New password: "));
-		cknewpw = getpass("Re-enter new password: ");
+		newpw = strdup(getpassphrase("New password: "));
+		cknewpw = getpassphrase("Re-enter new password: ");
 
-		if (strncmp(newpw, cknewpw, strlen(newpw)))
+		if( newpw== NULL || cknewpw == NULL ||
+			strncmp( newpw, cknewpw, strlen(newpw) ))
 		{
-			fprintf(stderr, "passwords do not match\n");
-			return(1);
+			fprintf( stderr, "passwords do not match\n" );
+			return EXIT_FAILURE;
+		}
+	}
+
+	if (want_bindpw && passwd.bv_val == NULL ) {
+		/* handle bind password */
+		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;
 	}
 
+	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
+
 	/* connect to server */
-	if ((ld = ldap_open(ldaphost, ldapport)) == NULL)
+	if( ( ldaphost != NULL || ldapport ) && ( ldapuri == NULL ) ) {
+		if ( verbose ) {
+			fprintf( stderr, "ldap_init( %s, %d )\n",
+				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>" );
+		}
+
+		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 */
+	if (ldap_set_option( ld, LDAP_OPT_REFERRALS,
+		referrals ? LDAP_OPT_ON : LDAP_OPT_OFF ) != LDAP_OPT_SUCCESS )
 	{
-		perror(ldaphost);
-		return(1);
+		fprintf( stderr, "Could not set LDAP_OPT_REFERRALS %s\n",
+			referrals ? "on" : "off" );
+		return EXIT_FAILURE;
 	}
 
-	/* set options */
-	ldap_set_option(ld, LDAP_OPT_TIMELIMIT, (void *)&timelimit);
-	ldap_set_option(ld, LDAP_OPT_SIZELIMIT, (void *)&sizelimit);
+	/* LDAPv3 only */
+	version = 3;
+	rc = ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version );
 
-	/* authenticate to server */
-	if (ldap_bind_s(ld, binddn, bindpw, LDAP_AUTH_SIMPLE) != LDAP_SUCCESS)
-	{
-		ldap_perror(ld, "ldap_bind");
-		return(1);
+	if(rc != LDAP_OPT_SUCCESS ) {
+		fprintf( stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n", version );
+		return EXIT_FAILURE;
 	}
 
-	if (filtpattern)
-	{
-		char filter[BUFSIZ];
-		LDAPMessage *result = NULL, *e = NULL;
-		char *attrs[] = {"dn", NULL};
-
-		/* search */
-		sprintf(filter, "%s", filtpattern);
-		i = ldap_search_s(ld, base, scope, filter, attrs, 1, &result);
-		if (i != LDAP_SUCCESS && i != LDAP_TIMELIMIT_EXCEEDED && i != LDAP_SIZELIMIT_EXCEEDED)
-		{
-			ldap_perror(ld, "ldap_search_s");
-			return(1);
+	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" );
+	}
 
-		for (e = ldap_first_entry(ld, result); e; e = ldap_next_entry(ld, e))
-		{
-			char *dn = ldap_get_dn(ld, e);
-			if (dn)
-			{
-				modify_dn(ld, dn, newpw);
-				free(dn);
+	if ( authmethod == LDAP_AUTH_SASL ) {
+#ifdef HAVE_CYRUS_SASL
+		void *defaults;
+
+		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 );
 			}
 		}
+		
+		defaults = lutil_sasl_defaults( ld,
+			sasl_mech,
+			sasl_realm,
+			sasl_authc_id,
+			passwd.bv_val,
+			sasl_authz_id );
+
+		rc = ldap_sasl_interactive_bind_s( ld, binddn,
+			sasl_mech, NULL, NULL,
+			sasl_flags, lutil_sasl_interact, defaults );
+
+		if( rc != LDAP_SUCCESS ) {
+			ldap_perror( ld, "ldap_sasl_interactive_bind_s" );
+			return( EXIT_FAILURE );
+		}
+#else
+		fprintf( stderr, "%s: 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 (targetdn)
-		modify_dn(ld, targetdn, newpw);
+	if( user != NULL || oldpw != NULL || newpw != NULL ) {
+		/* build change password control */
+		BerElement *ber = ber_alloc_t( LBER_USE_DER );
 
+		if( ber == NULL ) {
+			perror( "ber_alloc_t" );
+			ldap_unbind( ld );
+			return EXIT_FAILURE;
+		}
+
+		ber_printf( ber, "{" /*}*/ );
+
+		if( user != NULL ) {
+			ber_printf( ber, "ts",
+				LDAP_TAG_EXOP_X_MODIFY_PASSWD_ID, user );
+			free(user);
+		}
+
+		if( oldpw != NULL ) {
+			ber_printf( ber, "ts",
+				LDAP_TAG_EXOP_X_MODIFY_PASSWD_NEW, oldpw );
+			free(oldpw);
+		}
+
+		if( newpw != NULL ) {
+			ber_printf( ber, "ts",
+				LDAP_TAG_EXOP_X_MODIFY_PASSWD_NEW, newpw );
+			free(newpw);
+		}
+
+		ber_printf( ber, /*{*/ "N}" );
+
+		rc = ber_flatten( ber, &bv );
+
+		if( rc < 0 ) {
+			perror( "ber_flatten" );
+			ldap_unbind( ld );
+			return EXIT_FAILURE;
+		}
+
+		ber_free( ber, 1 );
+	}
+
+	if ( not ) {
+		rc = LDAP_SUCCESS;
+		goto skip;
+	}
+
+	rc = ldap_extended_operation( ld,
+		LDAP_EXOP_X_MODIFY_PASSWD, bv, 
+		NULL, NULL, &id );
+
+	ber_bvfree( bv );
+
+	if( rc != LDAP_SUCCESS ) {
+		ldap_perror( ld, "ldap_extended_operation" );
+		ldap_unbind( ld );
+		return EXIT_FAILURE;
+	}
+
+	rc = ldap_result( ld, LDAP_RES_ANY, LDAP_MSG_ALL, NULL, &res );
+	if ( rc < 0 ) {
+		ldap_perror( ld, "ldappasswd: ldap_result" );
+		return rc;
+	}
+
+	rc = ldap_parse_result( ld, res, &code, &matcheddn, &text, &refs, NULL, 0 );
+
+	if( rc != LDAP_SUCCESS ) {
+		ldap_perror( ld, "ldap_parse_result" );
+		return rc;
+	}
+
+	rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 1 );
+
+	if( rc != LDAP_SUCCESS ) {
+		ldap_perror( ld, "ldap_parse_result" );
+		return rc;
+	}
+
+	if( retdata != NULL ) {
+		ber_tag_t tag;
+		char *s;
+		BerElement *ber = ber_init( retdata );
+
+		if( ber == NULL ) {
+			perror( "ber_init" );
+			ldap_unbind( ld );
+			return EXIT_FAILURE;
+		}
+
+		/* we should check the tag */
+		tag = ber_scanf( ber, "{a}", &s);
+
+		if( tag == LBER_ERROR ) {
+			perror( "ber_scanf" );
+		} else {
+			printf("New password: %s\n", s);
+			free( s );
+		}
+
+		ber_free( ber, 1 );
+	}
+
+	if( verbose || code != LDAP_SUCCESS || matcheddn || text || refs ) {
+		printf( "Result: %s (%d)\n", ldap_err2string( code ), code );
+
+		if( text && *text ) {
+			printf( "Additional info: %s\n", text );
+		}
+
+		if( matcheddn && *matcheddn ) {
+			printf( "Matched DN: %s\n", matcheddn );
+		}
+
+		if( refs ) {
+			int i;
+			for( i=0; refs[i]; i++ ) {
+				printf("Referral: %s\n", refs[i] );
+			}
+		}
+	}
+
+	ber_memfree( text );
+	ber_memfree( matcheddn );
+	ber_memvfree( (void **) refs );
+	ber_memfree( retoid );
+	ber_bvfree( retdata );
+
+skip:
 	/* disconnect from server */
-	ldap_unbind(ld);
-	return(0);
+	ldap_unbind (ld);
+
+	return EXIT_SUCCESS;
 }