From d78a515860474cad1f9158d338b57dab1ea472c4 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 21 Sep 2000 23:00:51 +0000 Subject: [PATCH] Fix build issues --- servers/slapd/config.c | 22 +++++++++++----------- servers/slapd/connection.c | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/servers/slapd/config.c b/servers/slapd/config.c index ff6e7162c1..56246ad5ac 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -313,6 +313,17 @@ read_config( const char *fname ) global_realm = ch_strdup( cargv[1] ); } + } else if ( !strcasecmp( cargv[0], "saslregexp" ) ) { + if ( cargc != 3 ) { + Debug( LDAP_DEBUG_ANY, + "%s: line %d: need 2 args in \"saslregexp \"\n", + fname, lineno, 0 ); + return( 1 ); + } + rc = slap_sasl_regexp_config( cargv[1], cargv[2] ); + if ( rc ) + return rc; + /* SASL security properties */ } else if ( strcasecmp( cargv[0], "sasl-secprops" ) == 0 ) { char *txt; @@ -1111,17 +1122,6 @@ read_config( const char *fname ) #endif - } else if ( !strcasecmp( cargv[0], "saslregexp" ) ) { - if ( cargc != 3 ) { - Debug( LDAP_DEBUG_ANY, - "%s: line %d: need 2 args in \"saslregexp \"\n", - fname, lineno, 0 ); - return( 1 ); - } - rc = slap_sasl_regexp_config( cargv[1], cargv[2] ); - if ( rc ) - return rc; - /* pass anything else to the current backend info/db config routine */ } else { if ( bi != NULL ) { diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c index 4a77ce00e4..4341567d0d 100644 --- a/servers/slapd/connection.c +++ b/servers/slapd/connection.c @@ -1305,7 +1305,7 @@ int connection_internal_open( Connection **conn, LDAP **ldp, char *id ) } /* The connection_get() will have locked the connection's mutex */ - pthread_mutex_unlock( &((*conn)->c_mutex) ); + ldap_pvt_thread_mutex_unlock( &((*conn)->c_mutex) ); return( LDAP_SUCCESS ); } -- 2.39.5