upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 07:39:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

detect unavailable hash algorithms at startup

Browse source
This commit is contained in:
Pierangelo Masarati 2002-03-09 11:02:32 +00:00
parent 6d7556180d
commit a1b65bcdfe
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
servers/slapd/config.c
View file

@ -44,7 +44,7 @@ int global_idletimeout = 0;
char *global_host = NULL; char *global_host = NULL;
char *global_realm = NULL; char *global_realm = NULL;
char *ldap_srvtab = ""; char *ldap_srvtab = "";
char *default_passwd_hash; char *default_passwd_hash = NULL;
struct berval default_search_base = { 0, NULL }; struct berval default_search_base = { 0, NULL };
struct berval default_search_nbase = { 0, NULL }; struct berval default_search_nbase = { 0, NULL };
unsigned num_subordinates = 0; unsigned num_subordinates = 0;
@ -520,10 +520,23 @@ read_config( const char *fname )
return 1; return 1;
} else {
default_passwd_hash = ch_strdup( cargv[1] );
} }
if ( lutil_passwd_scheme( cargv[1] ) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
"%s: line %d: password scheme \"%s\" not available\n",
fname, lineno, cargv[1] ));
#else
Debug( LDAP_DEBUG_ANY,
"%s: line %d: password scheme \"%s\" not available\n",
fname, lineno, cargv[1] );
#endif
return 1;
}
default_passwd_hash = ch_strdup( cargv[1] );
} else if ( strcasecmp( cargv[0], "password-crypt-salt-format" ) == 0 ) } else if ( strcasecmp( cargv[0], "password-crypt-salt-format" ) == 0 )
{ {
if ( cargc < 2 ) { if ( cargc < 2 ) {

1
servers/slapd/passwd.c
View file

@ -314,6 +314,7 @@ slap_passwd_hash(
#endif #endif
tmp = lutil_passwd_hash( cred , hash ); tmp = lutil_passwd_hash( cred , hash );
assert( tmp != NULL );
#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD ) #if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
ldap_pvt_thread_mutex_unlock( &passwd_mutex ); ldap_pvt_thread_mutex_unlock( &passwd_mutex );