Fix build issues

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index ff6e7162c1af0a04e893f8077648a4f80ef5d564..56246ad5acafe6406b5e06d12081380c4e2457a5 100644 (file)
--- 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 <match> <replace>\"\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 <match> <replace>\"\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 4a77ce00e439f120c40e1df73ae182f96929abf4..4341567d0d82929098a391cfd9da769efffc2d10 100644 (file)
--- 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 );
 }