servers/slapd/slappasswd.c - diff

Return to slappasswd.c CVS log

Up to [OpenLDAP] / servers / slapd

Diff for /servers/slapd/slappasswd.c between versions 1.5.2.7 and 1.8

version 1.5.2.7, 2010/04/13 20:23:21	version 1.8, 2006/05/11 12:36:20
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/servers/slapd/slappasswd.c,v 1.5.2.6 2009/01/22 00:01:03 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/slappasswd.c,v 1.7 2006/05/11 01:09:40 hyc Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.	/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*	*
* Copyright 1998-2010 The OpenLDAP Foundation.	* Copyright 1998-2006 The OpenLDAP Foundation.
* Portions Copyright 1998-2003 Kurt D. Zeilenga.	* Portions Copyright 1998-2003 Kurt D. Zeilenga.
* All rights reserved.	* All rights reserved.
*	*
Line 37	Line 37
#include <lutil_sha1.h>	#include <lutil_sha1.h>

#include "ldap_defaults.h"	#include "ldap_defaults.h"
#include "slap.h"

static int verbose = 0;	static int verbose = 0;

Line 109 slappasswd( int argc, char *argv[] )	Line 108 slappasswd( int argc, char *argv[] )
return EXIT_FAILURE;	return EXIT_FAILURE;

} else {	} else {
scheme = ch_strdup( optarg );	scheme = strdup( optarg );
}	}
break;	break;

Line 128 slappasswd( int argc, char *argv[] )	Line 127 slappasswd( int argc, char *argv[] )

} else {	} else {
char* p;	char* p;
newpw = ch_strdup( optarg );	newpw = strdup( optarg );

for( p = optarg; *p != '\0'; p++ ) {	for( p = optarg; *p != '\0'; p++ ) {
*p = '\0';	*p = '\0';
Line 173 slappasswd( int argc, char *argv[] )	Line 172 slappasswd( int argc, char *argv[] )
if( newpw == NULL ) {	if( newpw == NULL ) {
/* prompt for new password */	/* prompt for new password */
char *cknewpw;	char *cknewpw;
newpw = ch_strdup(getpassphrase("New password: "));	newpw = strdup(getpassphrase("New password: "));
cknewpw = getpassphrase("Re-enter new password: ");	cknewpw = getpassphrase("Re-enter new password: ");

if( strcmp( newpw, cknewpw )) {	if( strcmp( newpw, cknewpw )) {

Removed from v.1.5.2.7
changed lines
	Added in v.1.8