Check for not LDAP_OPT_SUCCESS instead of LDAP_OPT_ERROR.

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index 7290fc3368d376f57c747c3a550139aec7db9b97..f6dbe163857e7c4c0895687f5bcc6509056a1895 100644 (file)
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -120,10 +120,10 @@ main( int argc, char **argv )
     }
 
        if ( debug ) {
-               if( ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug ) != LBER_OPT_ERROR ) {
+               if( ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug ) != LBER_OPT_SUCCESS ) {
                        fprintf( stderr, "Could not set LBER_OPT_DEBUG_LEVEL %d\n", debug );
                }
-               if( ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug ) != LDAP_OPT_ERROR ) {
+               if( ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug ) != LDAP_OPT_SUCCESS ) {
                        fprintf( stderr, "Could not set LDAP_OPT_DEBUG_LEVEL %d\n", debug );
                }
        }
@@ -147,7 +147,7 @@ main( int argc, char **argv )
                passwd = getpass("Enter LDAP Password: ");
 
        if (version != -1 &&
-               ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version ) == LDAP_OPT_ERROR)
+               ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version ) != LDAP_OPT_SUCCESS)
        {
                fprintf( stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n", version );
        }

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 1a01a1a8da764a8a1a461a922c23adf06ce30018..a08ff5166757cd79625e3c1492090d819bfa3954 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -210,10 +210,10 @@ main( int argc, char **argv )
     }
 
        if ( debug ) {
-               if( ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug ) != LBER_OPT_ERROR ) {
+               if( ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug ) != LBER_OPT_SUCCESS ) {
                        fprintf( stderr, "Could not set LBER_OPT_DEBUG_LEVEL %d\n", debug );
                }
-               if( ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug ) != LDAP_OPT_ERROR ) {
+               if( ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug ) != LDAP_OPT_SUCCESS ) {
                        fprintf( stderr, "Could not set LDAP_OPT_DEBUG_LEVEL %d\n", debug );
                }
                ldif_debug = debug;
@@ -239,7 +239,7 @@ main( int argc, char **argv )
                passwd = getpass("Enter LDAP Password: ");
 
        if (version != -1 &&
-               ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version ) == LDAP_OPT_ERROR)
+               ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version ) != LDAP_OPT_SUCCESS)
        {
                fprintf( stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n", version );
        }

diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index 6e98c7d32f0b91da3542418a50f92aced834cd47..3642ab79d8d142d23f8f415f10d0ee5b1e521e63 100644 (file)
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -173,10 +173,10 @@ main(int argc, char **argv)
     }
 
        if ( debug ) {
-               if( ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug ) != LBER_OPT_ERROR ) {
+               if( ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug ) != LBER_OPT_SUCCESS ) {
                        fprintf( stderr, "Could not set LBER_OPT_DEBUG_LEVEL %d\n", debug );
                }
-               if( ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug ) != LDAP_OPT_ERROR ) {
+               if( ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug ) != LDAP_OPT_SUCCESS ) {
                        fprintf( stderr, "Could not set LDAP_OPT_DEBUG_LEVEL %d\n", debug );
                }
        }
@@ -200,7 +200,7 @@ main(int argc, char **argv)
                passwd = getpass("Enter LDAP Password: ");
 
        if (version != -1 &&
-               ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version ) == LDAP_OPT_ERROR)
+               ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version ) != LDAP_OPT_SUCCESS)
        {
                fprintf( stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n", version );
        }

diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
index a2e31ea067ed3119c681bacefcd9662f21b054d0..b385ecbd9284e12c9fd5a660ddba609be61ffb28 100644 (file)
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -561,10 +561,10 @@ main (int argc, char *argv[])
        }
 
        if ( debug ) {
-               if( ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug ) != LBER_OPT_ERROR ) {
+               if( ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug ) != LBER_OPT_SUCCESS ) {
                        fprintf( stderr, "Could not set LBER_OPT_DEBUG_LEVEL %d\n", debug );
                }
-               if( ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug ) != LDAP_OPT_ERROR ) {
+               if( ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug ) != LDAP_OPT_SUCCESS ) {
                        fprintf( stderr, "Could not set LDAP_OPT_DEBUG_LEVEL %d\n", debug );
                }
        }
@@ -597,12 +597,12 @@ main (int argc, char *argv[])
 
        /* set options */
        if (timelimit != -1 &&
-               ldap_set_option( ld, LDAP_OPT_TIMELIMIT, (void *) &timelimit ) == LDAP_OPT_ERROR )
+               ldap_set_option( ld, LDAP_OPT_TIMELIMIT, (void *) &timelimit ) != LDAP_OPT_SUCCESS )
        {
                fprintf( stderr, "Could not set LDAP_OPT_TIMELIMIT %d\n", timelimit );
        }
        if (sizelimit != -1 &&
-               ldap_set_option( ld, LDAP_OPT_SIZELIMIT, (void *) &sizelimit ) == LDAP_OPT_ERROR )
+               ldap_set_option( ld, LDAP_OPT_SIZELIMIT, (void *) &sizelimit ) != LDAP_OPT_SUCCESS )
        {
                fprintf( stderr, "Could not set LDAP_OPT_SIZELIMIT %d\n", sizelimit );
        }
@@ -614,7 +614,7 @@ main (int argc, char *argv[])
        }
 
        if (version != -1 &&
-               ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version ) == LDAP_OPT_ERROR)
+               ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version ) != LDAP_OPT_SUCCESS )
        {
                fprintf( stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n", version );
        }

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index 2494e652dd378aee9566bba391da362ed189c9bc..5b227d1f722ba2b873c2f78750ca6be1699db3ef 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -259,10 +259,10 @@ main( int argc, char **argv )
     }
 
        if ( debug ) {
-               if( ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug ) != LBER_OPT_ERROR ) {
+               if( ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &debug ) != LBER_OPT_SUCCESS ) {
                        fprintf( stderr, "Could not set LBER_OPT_DEBUG_LEVEL %d\n", debug );
                }
-               if( ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug ) != LDAP_OPT_ERROR ) {
+               if( ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &debug ) != LDAP_OPT_SUCCESS ) {
                        fprintf( stderr, "Could not set LDAP_OPT_DEBUG_LEVEL %d\n", debug );
                }
                ldif_debug = debug;
@@ -284,30 +284,30 @@ main( int argc, char **argv )
     }
 
        if (deref != -1 &&
-               ldap_set_option( ld, LDAP_OPT_DEREF, (void *) &deref ) == LDAP_OPT_ERROR )
+               ldap_set_option( ld, LDAP_OPT_DEREF, (void *) &deref ) != LDAP_OPT_SUCCESS )
        {
                fprintf( stderr, "Could not set LDAP_OPT_DEREF %d\n", deref );
        }
        if (timelimit != -1 &&
-               ldap_set_option( ld, LDAP_OPT_TIMELIMIT, (void *) &timelimit ) == LDAP_OPT_ERROR )
+               ldap_set_option( ld, LDAP_OPT_TIMELIMIT, (void *) &timelimit ) != LDAP_OPT_SUCCESS )
        {
                fprintf( stderr, "Could not set LDAP_OPT_TIMELIMIT %d\n", timelimit );
        }
        if (sizelimit != -1 &&
-               ldap_set_option( ld, LDAP_OPT_SIZELIMIT, (void *) &sizelimit ) == LDAP_OPT_ERROR )
+               ldap_set_option( ld, LDAP_OPT_SIZELIMIT, (void *) &sizelimit ) != LDAP_OPT_SUCCESS )
        {
                fprintf( stderr, "Could not set LDAP_OPT_SIZELIMIT %d\n", sizelimit );
        }
        if (referrals != -1 &&
                ldap_set_option( ld, LDAP_OPT_REFERRALS,
-                                (referrals ? LDAP_OPT_ON : LDAP_OPT_OFF) ) == LDAP_OPT_ERROR )
+                                (referrals ? LDAP_OPT_ON : LDAP_OPT_OFF) ) != LDAP_OPT_SUCCESS )
        {
                fprintf( stderr, "Could not set LDAP_OPT_REFERRALS %s\n",
                        referrals ? "on" : "off" );
        }
 
        if (version != -1 &&
-               ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version ) == LDAP_OPT_ERROR)
+               ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version ) != LDAP_OPT_SUCCESS )
        {
                fprintf( stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n", version );
        }

diff --git a/clients/ud/main.c b/clients/ud/main.c
index 81e377d898f38d00e19107b50837629f57ce6b5b..ef8e1ae21aea31ebab7b10e2c26de2654b10c0bf 100644 (file)
--- a/clients/ud/main.c
+++ b/clients/ud/main.c
@@ -556,8 +556,8 @@ initialize_client( void )
 #endif
 
        if (ldebug) {
-               ber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &ldebug);
-               ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &ldebug);
+               ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &ldebug );
+               ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &ldebug );
        }
 
        /*