mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-07 14:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#3495 make sure lutil_passwd_init gets called

Browse Source
This commit is contained in:
Howard Chu 2005-01-20 00:23:36 +00:00
parent d515b91706
commit 3ae4b383d5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/liblutil/passwd.c
View File

@ -132,6 +132,7 @@ static LUTIL_PASSWD_HASH_FUNC hash_clear;
#endif #endif
static struct pw_slist *pw_schemes; static struct pw_slist *pw_schemes;
static int pw_inited;
static const struct pw_scheme pw_schemes_default[] = static const struct pw_scheme pw_schemes_default[] =
{ {
@ -173,6 +174,8 @@ int lutil_passwd_add(
{ {
struct pw_slist *ptr; struct pw_slist *ptr;
if (!pw_inited) lutil_passwd_init();
ptr = ber_memalloc( sizeof( struct pw_slist )); ptr = ber_memalloc( sizeof( struct pw_slist ));
if (!ptr) return -1; if (!ptr) return -1;
ptr->next = pw_schemes; ptr->next = pw_schemes;
@ -187,6 +190,8 @@ void lutil_passwd_init()
{ {
struct pw_scheme *s; struct pw_scheme *s;
pw_inited = 1;
for( s=(struct pw_scheme *)pw_schemes_default; s->name.bv_val; s++) { for( s=(struct pw_scheme *)pw_schemes_default; s->name.bv_val; s++) {
if ( lutil_passwd_add( &s->name, s->chk_fn, s->hash_fn ) ) break; if ( lutil_passwd_add( &s->name, s->chk_fn, s->hash_fn ) ) break;
} }
@ -207,7 +212,7 @@ static const struct pw_scheme *get_scheme(
{ {
struct pw_slist *pws; struct pw_slist *pws;
if (!pw_schemes) lutil_passwd_init(); if (!pw_inited) lutil_passwd_init();
for( pws=pw_schemes; pws; pws=pws->next ) { for( pws=pw_schemes; pws; pws=pws->next ) {
if( strcasecmp(scheme, pws->s.name.bv_val ) == 0 ) { if( strcasecmp(scheme, pws->s.name.bv_val ) == 0 ) {
@ -287,7 +292,7 @@ lutil_passwd(
return -1; return -1;
} }
if (!pw_schemes) lutil_passwd_init(); if (!pw_inited) lutil_passwd_init();
for( pws=pw_schemes; pws; pws=pws->next ) { for( pws=pw_schemes; pws; pws=pws->next ) {
if( pws->s.chk_fn ) { if( pws->s.chk_fn ) {