use macros instead of numbers...

diff --git a/clients/tools/common.c b/clients/tools/common.c
index 4eab80167fe95467f6bd57b97bb7c5016ca61920..5608a23a712b47911c505e86e5673bc2d64c9bce 100644 (file)
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -1003,7 +1003,7 @@ tool_bind( LDAP *ld )
                        }
                }
 
-               if ( ldap_result( ld, msgid, 1, NULL, &result ) == -1 ) {
+               if ( ldap_result( ld, msgid, LDAP_MSG_ALL, NULL, &result ) == -1 ) {
                        tool_perror( "ldap_result", -1, NULL, NULL, NULL, NULL );
                        exit( EXIT_FAILURE );
                }

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 481ff2f9b815b6a3b6428ba9719d28536cc989d0..a97a0d89f51c12079b0be8cdf3a2a3a26eb81ad4 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -1163,9 +1163,9 @@ static int process_response(
 
                rc = ldap_result( ld, msgid,
 #ifdef LDAP_GROUP_TRANSACTION
-                       txn ? 0 : 1,
+                       txn ? LDAP_MSG_ONE : LDAP_MSG_ALL,
 #else
-                       1,
+                       LDAP_MSG_ALL,
 #endif
                        &tv, &res );
                if ( tool_check_abandon( ld, msgid ) ) {

diff --git a/libraries/libldap/add.c b/libraries/libldap/add.c
index 88b849b3599adca773c2ab9f5787531050edd793..e6930b67dd9bfee44dda243842a3717ac530c92f 100644 (file)
--- a/libraries/libldap/add.c
+++ b/libraries/libldap/add.c
@@ -198,7 +198,7 @@ ldap_add_ext_s(
        if ( rc != LDAP_SUCCESS )
                return( rc );
 
-       if ( ldap_result( ld, msgid, 1, (struct timeval *) NULL, &res ) == -1 )
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 )
                return( ld->ld_errno );
 
        return( ldap_result2error( ld, res, 1 ) );

diff --git a/libraries/libldap/compare.c b/libraries/libldap/compare.c
index 70249ad1b03ddeda10dfbbf13586455a519aafc1..cc64917fa4eb96fcd90f8960009839cf26e76ce6 100644 (file)
--- a/libraries/libldap/compare.c
+++ b/libraries/libldap/compare.c
@@ -156,7 +156,7 @@ ldap_compare_ext_s(
        if (  rc != LDAP_SUCCESS )
                return( rc );
 
-       if ( ldap_result( ld, msgid, 1, (struct timeval *) NULL, &res ) == -1 )
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 )
                return( ld->ld_errno );
 
        return( ldap_result2error( ld, res, 1 ) );

diff --git a/libraries/libldap/delete.c b/libraries/libldap/delete.c
index 16e768cb534e7f4ac9cec5f0e1fd27e5242dd88a..72b5a41a2347ff0568a34395fc2b03bceb3d6dd9 100644 (file)
--- a/libraries/libldap/delete.c
+++ b/libraries/libldap/delete.c
@@ -123,7 +123,7 @@ ldap_delete_ext_s(
        if( rc != LDAP_SUCCESS )
                return( ld->ld_errno );
 
-       if ( ldap_result( ld, msgid, 1, (struct timeval *) NULL, &res ) == -1 )
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 )
                return( ld->ld_errno );
 
        return( ldap_result2error( ld, res, 1 ) );

diff --git a/libraries/libldap/extended.c b/libraries/libldap/extended.c
index 137dc69f040c9874053ada01f5d2d6dafd132028..75ba8dfce6d057a490ab8ae85da8bb106b3baaeb 100644 (file)
--- a/libraries/libldap/extended.c
+++ b/libraries/libldap/extended.c
@@ -140,7 +140,7 @@ ldap_extended_operation_s(
         return( rc );
        }
  
-    if ( ldap_result( ld, msgid, 1, (struct timeval *) NULL, &res ) == -1 ) {
+    if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 ) {
         return( ld->ld_errno );
        }
 

diff --git a/libraries/libldap/groupings.c b/libraries/libldap/groupings.c
index fe768f17acad689313c30966293974d7363c14a3..d4495364a5ca7e3b5e4c86e3fd99771a5114d724 100644 (file)
--- a/libraries/libldap/groupings.c
+++ b/libraries/libldap/groupings.c
@@ -82,9 +82,9 @@ int ldap_grouping_create_s(
        struct berval **retgrpcookiep,
        struct berval **retgrpdatap )
 {
-    int     rc;
-    int     msgid;
-    LDAPMessage *res;
+       int     rc;
+       int     msgid;
+       LDAPMessage *res;
 
        Debug( LDAP_DEBUG_TRACE, "ldap_grouping_create_s\n", 0, 0, 0 );
 
@@ -92,14 +92,14 @@ int ldap_grouping_create_s(
        assert( LDAP_VALID( ld ) );
        assert( grpoid != NULL || *grpoid == '\0' );
 
-    rc = ldap_grouping_create( ld, grpoid, grpdata,
+       rc = ldap_grouping_create( ld, grpoid, grpdata,
                sctrls, cctrls, &msgid );
-    if ( rc != LDAP_SUCCESS ) {
-        return rc;
+       if ( rc != LDAP_SUCCESS ) {
+               return rc;
        }
  
-    if ( ldap_result( ld, msgid, 1, (struct timeval *) NULL, &res ) == -1 ) {
-        return ld->ld_errno;
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 ) {
+               return ld->ld_errno;
        }
 
        if ( retgrpcookiep != NULL ) *retgrpcookiep = NULL;
@@ -116,7 +116,7 @@ int ldap_grouping_create_s(
                return rc;
        }
 
-    return( ldap_result2error( ld, res, 1 ) );
+       return( ldap_result2error( ld, res, 1 ) );
 }
 
 int ldap_grouping_end(

diff --git a/libraries/libldap/kbind.c b/libraries/libldap/kbind.c
index 4f963cbd01a7009e33084d35cf5f49ad43105da6..b8562f612ffa7c750065fd664e062a13bb7c7c01 100644 (file)
--- a/libraries/libldap/kbind.c
+++ b/libraries/libldap/kbind.c
@@ -126,7 +126,7 @@ ldap_kerberos_bind1_s( LDAP *ld, LDAP_CONST char *dn )
                return( ld->ld_errno );
 
        /* wait for a result */
-       if ( ldap_result( ld, msgid, 1, (struct timeval *) 0, &res )
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) 0, &res )
            == -1 ) {
                return( ld->ld_errno ); /* ldap_result sets ld_errno */
        }
@@ -205,7 +205,7 @@ ldap_kerberos_bind2_s( LDAP *ld, LDAP_CONST char *dn )
                return( ld->ld_errno );
 
        /* wait for a result */
-       if ( ldap_result( ld, msgid, 1, (struct timeval *) 0, &res )
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) 0, &res )
            == -1 ) {
                return( ld->ld_errno ); /* ldap_result sets ld_errno */
        }

diff --git a/libraries/libldap/modify.c b/libraries/libldap/modify.c
index a03fd47057663c5372d73599e2522fe206cea65f..fb938fc3b89e5817c6a446c8e2ac27e2794646f0 100644 (file)
--- a/libraries/libldap/modify.c
+++ b/libraries/libldap/modify.c
@@ -197,7 +197,7 @@ ldap_modify_ext_s( LDAP *ld, LDAP_CONST char *dn,
        if ( rc != LDAP_SUCCESS )
                return( rc );
 
-       if ( ldap_result( ld, msgid, 1, (struct timeval *) NULL, &res ) == -1 )
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 )
                return( ld->ld_errno );
 
        return( ldap_result2error( ld, res, 1 ) );

diff --git a/libraries/libldap/modrdn.c b/libraries/libldap/modrdn.c
index 0f46ec39454c57cc39d4b8845a596d5fb400bcd4..246cede995f66508649cf8f2edd006ef15130ecc 100644 (file)
--- a/libraries/libldap/modrdn.c
+++ b/libraries/libldap/modrdn.c
@@ -219,7 +219,7 @@ ldap_rename_s(
                return rc;
        }
 
-       rc = ldap_result( ld, msgid, 1, NULL, &res );
+       rc = ldap_result( ld, msgid, LDAP_MSG_ALL, NULL, &res );
 
        if( rc == -1 ) {
                return ld->ld_errno;

diff --git a/libraries/libldap/passwd.c b/libraries/libldap/passwd.c
index eef1510be5b8bcd043eed5dc82f0bcd506ac2f50..49fe8bb24e0ddef661fea66efc63830e89ad3a53 100644 (file)
--- a/libraries/libldap/passwd.c
+++ b/libraries/libldap/passwd.c
@@ -156,7 +156,7 @@ ldap_passwd_s(
                return rc;
        }
 
-       if ( ldap_result( ld, msgid, 1, (struct timeval *) NULL, &res ) == -1 ) {
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 ) {
                return ld->ld_errno;
        }
 

diff --git a/libraries/libldap/sasl.c b/libraries/libldap/sasl.c
index e47302f33b3ef14cddf255e05a07bab87979975a..f1576faf8f9d9fa090fd8285300ee9f6f7e09386 100644 (file)
--- a/libraries/libldap/sasl.c
+++ b/libraries/libldap/sasl.c
@@ -196,7 +196,7 @@ ldap_sasl_bind_s(
        }
 #endif
 
-       if ( ldap_result( ld, msgid, 1, NULL, &result ) == -1 ) {
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, NULL, &result ) == -1 ) {
                return( ld->ld_errno ); /* ldap_result sets ld_errno */
        }
 

diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index 623c2fb31746c6f4c1c6809e6bde1ce10d40cbc4..60cac86f305042bb7daf3b7b274fe7f654c92077 100644 (file)
--- a/libraries/libldap/search.c
+++ b/libraries/libldap/search.c
@@ -138,7 +138,7 @@ ldap_search_ext_s(
                return( rc );
        }
 
-       rc = ldap_result( ld, msgid, 1, timeout, res );
+       rc = ldap_result( ld, msgid, LDAP_MSG_ALL, timeout, res );
 
        if( rc <= 0 ) {
                /* error(-1) or timeout(0) */
@@ -331,7 +331,7 @@ ldap_search_st(
            == -1 )
                return( ld->ld_errno );
 
-       if ( ldap_result( ld, msgid, 1, timeout, res ) == -1 )
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, timeout, res ) == -1 )
                return( ld->ld_errno );
 
        if ( ld->ld_errno == LDAP_TIMEOUT ) {
@@ -359,7 +359,7 @@ ldap_search_s(
            == -1 )
                return( ld->ld_errno );
 
-       if ( ldap_result( ld, msgid, 1, (struct timeval *) NULL, res ) == -1 )
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, res ) == -1 )
                return( ld->ld_errno );
 
        return( ldap_result2error( ld, *res, 0 ) );

diff --git a/libraries/libldap/whoami.c b/libraries/libldap/whoami.c
index 498af5a180f869004197ce3b7c8b1b99c45444a9..79c8aa48e217a1a64f706b3bf37bd55e608e6761 100644 (file)
--- a/libraries/libldap/whoami.c
+++ b/libraries/libldap/whoami.c
@@ -88,7 +88,7 @@ ldap_whoami_s(
        rc = ldap_whoami( ld, sctrls, cctrls, &msgid );
        if ( rc != LDAP_SUCCESS ) return rc;
 
-       if ( ldap_result( ld, msgid, 1, (struct timeval *) NULL, &res ) == -1 ) {
+       if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 ) {
                return ld->ld_errno;
        }
 

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index c67eb606401562f0bcb27128cf739781343f8821..b9be36a40825d824983394b93f06ab1665dd7309 100644 (file)
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -851,7 +851,7 @@ ldap_back_op_result(
 
 retry:;
                /* if result parsing fails, note the failure reason */
-               rc = ldap_result( lc->lc_ld, msgid, 1, &tv, &res );
+               rc = ldap_result( lc->lc_ld, msgid, LDAP_MSG_ALL, &tv, &res );
                switch ( rc ) {
                case 0:
                        if ( timeout ) {

diff --git a/servers/slapd/back-ldap/config.c b/servers/slapd/back-ldap/config.c
index 07221bdfbd85c1c2230fe11d866ece1cd7bc9a69..4a22a48b807c4014bb7f2415f7b196ece5cac8a7 100644 (file)
--- a/servers/slapd/back-ldap/config.c
+++ b/servers/slapd/back-ldap/config.c
@@ -1280,7 +1280,7 @@ ldap_back_exop_whoami(
 retry:
                rs->sr_err = ldap_whoami( lc->lc_ld, ctrls, NULL, &msgid );
                if ( rs->sr_err == LDAP_SUCCESS ) {
-                       if ( ldap_result( lc->lc_ld, msgid, 1, NULL, &res ) == -1 ) {
+                       if ( ldap_result( lc->lc_ld, msgid, LDAP_MSG_ALL, NULL, &res ) == -1 ) {
                                ldap_get_option( lc->lc_ld, LDAP_OPT_ERROR_NUMBER,
                                        &rs->sr_err );
                                if ( rs->sr_err == LDAP_SERVER_DOWN && doretry ) {

diff --git a/servers/slapd/back-ldap/extended.c b/servers/slapd/back-ldap/extended.c
index dae58547f0a4ecb339a406c3d759e66ece8f6215..5c631ba4a1caebcf2071cfc14f7beaf10166d750 100644 (file)
--- a/servers/slapd/back-ldap/extended.c
+++ b/servers/slapd/back-ldap/extended.c
@@ -122,7 +122,7 @@ retry:
                op->o_ctrls, NULL, &msgid );
 
        if ( rc == LDAP_SUCCESS ) {
-               if ( ldap_result( lc->lc_ld, msgid, 1, NULL, &res ) == -1 ) {
+               if ( ldap_result( lc->lc_ld, msgid, LDAP_MSG_ALL, NULL, &res ) == -1 ) {
                        ldap_get_option( lc->lc_ld, LDAP_OPT_ERROR_NUMBER, &rc );
                        ldap_back_freeconn( op, lc, 0 );
                        lc = NULL;

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index 1a30eb6960e81ca78596bff6596a93c6c5385bff..dde7795a85935e7d18f2a93580e529971eb1da58 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -258,7 +258,7 @@ retry:
         * but this is necessary for version matching, and for ACL processing.
         */
 
-       for ( rc = 0; rc != -1; rc = ldap_result( lc->lc_ld, msgid, 0, &tv, &res ) )
+       for ( rc = 0; rc != -1; rc = ldap_result( lc->lc_ld, msgid, LDAP_MSG_ONE, &tv, &res ) )
        {
                /* check for abandon */
                if ( op->o_abandon ) {

diff --git a/servers/slapd/back-meta/add.c b/servers/slapd/back-meta/add.c
index 84dc2b7f1c6e45d81395b22590d36b80581f7093..c6c349ab1508198b1bbab6d8fc6e7a81a7bee71b 100644 (file)
--- a/servers/slapd/back-meta/add.c
+++ b/servers/slapd/back-meta/add.c
@@ -186,7 +186,7 @@ retry:;
 
                rs->sr_err = LDAP_OTHER;
                rc = ldap_result( mc->mc_conns[ candidate ].msc_ld,
-                       msgid, LDAP_MSG_ONE, tvp, &res );
+                       msgid, LDAP_MSG_ALL, tvp, &res );
                switch ( rc ) {
                case -1:
                        send_ldap_result( op, rs );

diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c
index 88c9a722f19171f6e7e6ed3eaf9bc31d097a0ef8..f2c2035fb037772c80f989f05489c2baf54f1c11 100644 (file)
--- a/servers/slapd/back-meta/bind.c
+++ b/servers/slapd/back-meta/bind.c
@@ -343,7 +343,7 @@ rebind:;
                 */
 retry:;
                tv = mt->mt_bind_timeout;
-               switch ( ldap_result( msc->msc_ld, msgid, 0, &tv, &res ) ) {
+               switch ( ldap_result( msc->msc_ld, msgid, LDAP_MSG_ALL, &tv, &res ) ) {
                case 0:
                        snprintf( buf, sizeof( buf ),
                                "ldap_result=0 nretries=%d%s\n",
@@ -499,7 +499,7 @@ rebind:;
                 */
 retry:;
                tv = mt->mt_bind_timeout;
-               switch ( ldap_result( msc->msc_ld, msgid, 0, &tv, &res ) ) {
+               switch ( ldap_result( msc->msc_ld, msgid, LDAP_MSG_ALL, &tv, &res ) ) {
                case 0:
                        snprintf( buf, sizeof( buf ),
                                "ldap_result=0 nretries=%d%s",

diff --git a/servers/slapd/back-meta/compare.c b/servers/slapd/back-meta/compare.c
index 65fdde05f01c50c9a084b29dacd6ba974f750884..b0d716c6fcdfc3c1f54c13a7d29af318d2f3d615 100644 (file)
--- a/servers/slapd/back-meta/compare.c
+++ b/servers/slapd/back-meta/compare.c
@@ -185,7 +185,7 @@ meta_back_compare( Operation *op, SlapReply *rs )
                        }
 
                        lrc = ldap_result( msc->msc_ld, msgid[ i ],
-                                       0, &tv, &res );
+                                       LDAP_MSG_ALL, &tv, &res );
 
                        if ( lrc == 0 ) {
                                assert( res == NULL );

diff --git a/servers/slapd/back-meta/delete.c b/servers/slapd/back-meta/delete.c
index 42f77bf966836ca987204678d0c509421476107f..b810a99b6f8a00915b23137516789adc61017d8c 100644 (file)
--- a/servers/slapd/back-meta/delete.c
+++ b/servers/slapd/back-meta/delete.c
@@ -84,7 +84,7 @@ retry:;
 
                rs->sr_err = LDAP_OTHER;
                rc = ldap_result( mc->mc_conns[ candidate ].msc_ld,
-                       msgid, LDAP_MSG_ONE, tvp, &res );
+                       msgid, LDAP_MSG_ALL, tvp, &res );
                switch ( rc ) {
                case -1:
                        rs->sr_err = LDAP_OTHER;

diff --git a/servers/slapd/back-meta/modify.c b/servers/slapd/back-meta/modify.c
index 9701257022b814e9bc6f5a677a4c076175f69b41..30e48326b671935fcbc8826634fdec42860f8b35 100644 (file)
--- a/servers/slapd/back-meta/modify.c
+++ b/servers/slapd/back-meta/modify.c
@@ -194,7 +194,7 @@ retry:;
 
                rs->sr_err = LDAP_OTHER;
                rc = ldap_result( mc->mc_conns[ candidate ].msc_ld,
-                       msgid, LDAP_MSG_ONE, tvp, &res );
+                       msgid, LDAP_MSG_ALL, tvp, &res );
                switch ( rc ) {
                case -1:
                        rc = -1;

diff --git a/servers/slapd/back-meta/modrdn.c b/servers/slapd/back-meta/modrdn.c
index 1c943b95d311eaf2e907e1092b856b3fc9f731ee..83efbb176c506af13e23776258733b85a7870396 100644 (file)
--- a/servers/slapd/back-meta/modrdn.c
+++ b/servers/slapd/back-meta/modrdn.c
@@ -125,7 +125,7 @@ retry:;
 
                rs->sr_err = LDAP_OTHER;
                rc = ldap_result( mc->mc_conns[ candidate ].msc_ld,
-                       msgid, LDAP_MSG_ONE, tvp, &res );
+                       msgid, LDAP_MSG_ALL, tvp, &res );
                switch ( rc ) {
                case -1:
                        break;

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index b64c92d9359d65df27ddd6247ccae79e97af2397..a3d55ca3b7a69b3bd19dac380b1648a091d96443 100644 (file)
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -389,7 +389,7 @@ meta_back_search( Operation *op, SlapReply *rs )
                         */
 get_result:;
                        rc = ldap_result( msc->msc_ld, candidates[ i ].sr_msgid,
-                                       0, &tv, &res );
+                                       LDAP_MSG_ONE, &tv, &res );
 
                        if ( rc == 0 ) {
                                /* FIXME: res should not need to be freed */

diff --git a/tests/progs/slapd-search.c b/tests/progs/slapd-search.c
index 0f3c1e63a006a51172ae4031ac83742da8e6728d..7d8017349903da7f0adeacb08c6aba14e2e08a87 100644 (file)
--- a/tests/progs/slapd-search.c
+++ b/tests/progs/slapd-search.c
@@ -181,6 +181,7 @@ retry:;
        rc = ldap_bind_s( ld, manager, passwd, LDAP_AUTH_SIMPLE );
        if ( rc != LDAP_SUCCESS ) {
                ldap_perror( ld, "ldap_bind" );
+               ldap_unbind_ext( ld, NULL, NULL );
                switch ( rc ) {
                case LDAP_BUSY:
                case LDAP_UNAVAILABLE:
@@ -205,6 +206,7 @@ retry:;
                                filter, attrs, 0, &res );
                if ( rc != LDAP_SUCCESS ) {
                        ldap_perror( ld, "ldap_search" );
+                       ldap_unbind_ext( ld, NULL, NULL );
                        if ( rc == LDAP_BUSY && do_retry > 0 ) {
                                do_retry--;
                                goto retry;
@@ -219,5 +221,5 @@ retry:;
 
        fprintf( stderr, " PID=%ld - Search done (%d).\n", (long) pid, rc );
 
-       ldap_unbind( ld );
+       ldap_unbind_ext( ld, NULL, NULL );
 }