Sync with HEAD

diff --git a/libraries/libldap/extended.c b/libraries/libldap/extended.c
index f311557c5ae1be4eff8cdb128db0fcd45e715a89..99d29d8f62ec844feac77140b87362ae60f415c7 100644 (file)
--- a/libraries/libldap/extended.c
+++ b/libraries/libldap/extended.c
@@ -210,7 +210,7 @@ ldap_parse_extended_result (
                return ld->ld_errno;
        }
 
-       rc = ber_scanf( ber, "{iaa" /*}*/, &errcode,
+       rc = ber_scanf( ber, "{eaa" /*}*/, &errcode,
                &ld->ld_matched, &ld->ld_error );
 
        if( rc == LBER_ERROR ) {

diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index 56eb3291c3c8038ba7f43d4448f7a5fae3d1e004..2652c81f2999a264ef9f096c61061c13fd6f6e7d 100644 (file)
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -555,7 +555,7 @@ nextresp2:
                        ber_len_t       len;
                        char            *lr_res_error = NULL;
 
-                       if ( ber_scanf( &tmpber, "{iaa",/*}*/ &lderr,
+                       if ( ber_scanf( &tmpber, "{eaa",/*}*/ &lderr,
                                    &lr->lr_res_matched, &lr_res_error )
                                    != LBER_ERROR )
                        {
@@ -636,7 +636,7 @@ nextresp2:
                                 */
                                if ( tag == LDAP_RES_SEARCH_RESULT )
                                        refer_cnt = 0;
-                       } else if ( ber_scanf( &tmpber, "{iaa}", &lderr,
+                       } else if ( ber_scanf( &tmpber, "{eaa}", &lderr,
                                &lr->lr_res_matched, &lr_res_error )
                                != LBER_ERROR )
                        {
@@ -978,7 +978,7 @@ build_result_ber( LDAP *ld, BerElement **bp, LDAPRequest *lr )
                return( LBER_ERROR );
        }
 
-       if ( ber_get_int( ber, &along ) == LBER_ERROR ) {
+       if ( ber_get_enum( ber, &along ) == LBER_ERROR ) {
                ld->ld_errno = LDAP_DECODING_ERROR;
                ber_free(ber, 1);
                return( LBER_ERROR );

diff --git a/libraries/libldap/sasl.c b/libraries/libldap/sasl.c
index 91f30e6f675badbd8d04306ad605f7cc7d13c4b8..849a9fa3809c04d2001d3bc28f98f9a6efc6cd3d 100644 (file)
--- a/libraries/libldap/sasl.c
+++ b/libraries/libldap/sasl.c
@@ -306,7 +306,7 @@ ldap_parse_sasl_bind_result(
        } else {
                ber_len_t len;
 
-               tag = ber_scanf( ber, "{iaa" /*}*/,
+               tag = ber_scanf( ber, "{eaa" /*}*/,
                        &errcode, &ld->ld_matched, &ld->ld_error );
 
                if( tag == LBER_ERROR ) {

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 02becaa502dffef82691e5d85472fb5931edd34c..1cac009c99b3eaeb9f366d9eae9a0e0fb00efc4f 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -272,6 +272,8 @@ int main( int argc, char **argv )
 
        slap_sl_mem_init();
 
+       (void) ldap_pvt_thread_initialize();
+
        serverName = lutil_progname( "slapd", argc, argv );
 
        if ( strcmp( serverName, "slapd" ) ) {
@@ -531,8 +533,6 @@ unhandled_option:;
                }
        }
 
-       (void) ldap_pvt_thread_initialize();
-
        ber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &slap_debug);
        ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &slap_debug);
        ldif_debug = slap_debug;