From 5f63dfc5660db5c6e04be35c79bfc424ed522cae Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Tue, 2 Mar 2004 22:11:31 +0000 Subject: [PATCH] lutil_passwd_hash result berval is in argument list now --- servers/slapd/slappasswd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/servers/slapd/slappasswd.c b/servers/slapd/slappasswd.c index c90e811d04..50575217fd 100644 --- a/servers/slapd/slappasswd.c +++ b/servers/slapd/slappasswd.c @@ -65,7 +65,7 @@ slappasswd( int argc, char *argv[] ) int i; struct berval passwd; - struct berval *hash = NULL; + struct berval hash; while( (i = getopt( argc, argv, "c:d:h:s:T:vu" )) != EOF ) @@ -131,20 +131,20 @@ slappasswd( int argc, char *argv[] ) passwd.bv_len = strlen(passwd.bv_val); } - hash = lutil_passwd_hash( &passwd, scheme, &text ); - if( hash == NULL || hash->bv_val == NULL ) { + lutil_passwd_hash( &passwd, scheme, &hash, &text ); + if( hash.bv_val == NULL ) { fprintf( stderr, "Password generation failed for scheme %s: %s\n", scheme, text ? text : "" ); return EXIT_FAILURE; } - if( lutil_passwd( hash, &passwd, NULL, &text ) ) { + if( lutil_passwd( &hash, &passwd, NULL, &text ) ) { fprintf( stderr, "Password verification failed. %s\n", text ? text : "" ); return EXIT_FAILURE; } - printf( "%s\n" , hash->bv_val ); + printf( "%s\n" , hash.bv_val ); return EXIT_SUCCESS; } -- 2.39.5