/* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Portions Copyright 1998-2003 Kurt D. Zeilenga.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by Kurt Zeilenga for inclusion
+ * in OpenLDAP Software.
*/
#include "portable.h"
" -c format\tcrypt(3) salt format\n"
" -u\t\tgenerate RFC2307 values (default)\n"
" -v\t\tincrease verbosity\n"
+ " -T file\tread file for new password\n"
, s );
exit( EXIT_FAILURE );
{
char *scheme = "{SSHA}";
char *newpw = NULL;
+ char *pwfile = NULL;
+ const char *text;
int i;
struct berval passwd;
struct berval *hash = NULL;
while( (i = getopt( argc, argv,
- "c:d:h:s:vu" )) != EOF )
+ "c:d:h:s:T:vu" )) != EOF )
{
switch (i) {
case 'c': /* crypt salt format */
for( p = optarg; *p != '\0'; p++ ) {
*p = '\0';
}
-
} break;
+ case 'T': /* password file */
+ pwfile = optarg;
+ break;
+
case 'u': /* RFC2307 userPassword */
break;
usage( argv[0] );
}
- if( newpw == NULL ) {
- /* prompt for new password */
- char *cknewpw;
- newpw = strdup(getpassphrase("New password: "));
- cknewpw = getpassphrase("Re-enter new password: ");
-
- if( strcmp( newpw, cknewpw )) {
- fprintf( stderr, "Password values do not match\n" );
+ if( pwfile != NULL ) {
+ if( lutil_get_filed_password( pwfile, &passwd )) {
return EXIT_FAILURE;
}
- }
+ } else {
+ if( newpw == NULL ) {
+ /* prompt for new password */
+ char *cknewpw;
+ newpw = strdup(getpassphrase("New password: "));
+ cknewpw = getpassphrase("Re-enter new password: ");
+
+ if( strcmp( newpw, cknewpw )) {
+ fprintf( stderr, "Password values do not match\n" );
+ return EXIT_FAILURE;
+ }
+ }
- passwd.bv_val = newpw;
- passwd.bv_len = strlen(passwd.bv_val);
+ passwd.bv_val = newpw;
+ passwd.bv_len = strlen(passwd.bv_val);
+ }
- hash = lutil_passwd_hash( &passwd, scheme );
+ hash = lutil_passwd_hash( &passwd, scheme, &text );
if( hash == NULL || hash->bv_val == NULL ) {
- fprintf( stderr, "Password generation failed.\n");
+ fprintf( stderr, "Password generation failed. %s\n",
+ text ? text : "" );
return EXIT_FAILURE;
}
- if( lutil_passwd( hash, &passwd, NULL ) ) {
- fprintf( stderr, "Password verification failed.\n");
+ if( lutil_passwd( hash, &passwd, NULL, &text ) ) {
+ fprintf( stderr, "Password verification failed. %s\n",
+ text ? text : "" );
return EXIT_FAILURE;
}