upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-20 05:43:01 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#2906: report invalid userPassword schemes, clarify documentation

Browse source
This commit is contained in:
Kurt Zeilenga 2004-01-09 04:11:57 +00:00
parent 14da72a97a
commit c8408d3c6a
3 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/man/man8/slappasswd.8
View file

@ -64,6 +64,12 @@ be specified:
The default is
.IR {SSHA} .
Note that scheme names may need to be protected, due to
.B {
and
.BR } ,
from expansion by the user's command interpreter.
.B {SHA}
and
.B {SSHA}

12
libraries/liblutil/passwd.c
View file

@ -377,9 +377,17 @@ struct berval * lutil_passwd_hash(
{
const struct pw_scheme *sc = get_scheme( method );
if( sc == NULL ) {
*text = "scheme not recognized";
return NULL;
}
if( ! sc->hash_fn ) {
*text = "scheme provided no hash function";
return NULL;
}
if( text ) *text = NULL;
if( sc == NULL ) return NULL;
if( ! sc->hash_fn ) return NULL;
return (sc->hash_fn)( &sc->name, passwd, text );
}

6
servers/slapd/tools/slappasswd.c
View file

@ -131,10 +131,10 @@ main( int argc, char *argv[] )
}
hash = lutil_passwd_hash( &passwd, scheme, &text );
if( hash == NULL || hash->bv_val == NULL ) {
fprintf( stderr, "Password generation failed. %s\n",
text ? text : "" );
fprintf( stderr,
"Password generation failed for scheme %s: %s\n",
scheme, text ? text : "" );
return EXIT_FAILURE;
}