Fix SLAPD_SPASSWD typo which caused passwd_mutex not to be used

consistently.
This commit is contained in:
Kurt Zeilenga 2000-10-09 19:09:28 +00:00
parent 6777a3a41a
commit c42c2847cf
3 changed files with 8 additions and 8 deletions

View File

@ -519,7 +519,7 @@ be_isroot_pw( Backend *be,
return 0;
}
#if defined( SLAPD_CRYPT ) || defined( SLAPD_PASSWD )
#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
ldap_pvt_thread_mutex_lock( &passwd_mutex );
#ifdef SLAPD_SPASSWD
lutil_passwd_sasl_conn = conn->c_sasl_context;
@ -528,7 +528,7 @@ be_isroot_pw( Backend *be,
result = lutil_passwd( &be->be_root_pw, cred, NULL );
#if defined( SLAPD_CRYPT ) || defined( SLAPD_PASSWD )
#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
#ifdef SLAPD_SPASSWD
lutil_passwd_sasl_conn = NULL;
#endif

View File

@ -40,7 +40,7 @@ char **g_argv;
*/
ldap_pvt_thread_pool_t connection_pool;
ldap_pvt_thread_mutex_t gmtime_mutex;
#if defined( SLAPD_CRYPT ) || defined( SLAPD_PASSWD )
#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
ldap_pvt_thread_mutex_t passwd_mutex;
#endif
@ -103,7 +103,7 @@ slap_init( int mode, const char *name )
ldap_pvt_thread_mutex_init( &num_sent_mutex );
ldap_pvt_thread_mutex_init( &gmtime_mutex );
#if defined( SLAPD_CRYPT ) || defined( SLAPD_PASSWD )
#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
ldap_pvt_thread_mutex_init( &passwd_mutex );
#endif

View File

@ -224,7 +224,7 @@ slap_passwd_check(
int i;
int result = 1;
#if defined( SLAPD_CRYPT ) || defined( SLAPD_PASSWD )
#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
ldap_pvt_thread_mutex_lock( &passwd_mutex );
#ifdef SLAPD_SPASSWD
lutil_passwd_sasl_conn = conn->c_sasl_context;
@ -238,7 +238,7 @@ slap_passwd_check(
}
}
#if defined( SLAPD_CRYPT ) || defined( SLAPD_PASSWD )
#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
#ifdef SLAPD_SPASSWD
lutil_passwd_sasl_conn = NULL;
#endif
@ -266,13 +266,13 @@ struct berval * slap_passwd_hash(
struct berval *new;
#if defined( SLAPD_CRYPT ) || defined( SLAPD_PASSWD )
#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
ldap_pvt_thread_mutex_lock( &passwd_mutex );
#endif
new = lutil_passwd_hash( cred , hash );
#if defined( SLAPD_CRYPT ) || defined( SLAPD_PASSWD )
#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
ldap_pvt_thread_mutex_unlock( &passwd_mutex );
#endif