Fix typos in version checking

diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index 4cbf84f1eea8e852a5efe818e52a16eec365b268..1d7897cec7dddbe22043ba280c443560208a8f42 100644 (file)
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -247,7 +247,7 @@ main( int argc, char **argv )
                version = LDAP_VERSION2;
        }
        else if ( authmethod == LDAP_AUTH_SASL ) {
-               if( version != -1 || version != LDAP_VERSION3 ) {
+               if( version != -1 && version != LDAP_VERSION3 ) {
                        fprintf( stderr, "SASL requires LDAPv3\n" );
                        return( EXIT_FAILURE );
                }
@@ -255,7 +255,7 @@ main( int argc, char **argv )
        }
 
        if( manageDSAit ) {
-               if( version != -1 || version != LDAP_VERSION3 ) {
+               if( version != -1 && version != LDAP_VERSION3 ) {
                        fprintf(stderr, "manage DSA control requires LDAPv3\n");
                        return EXIT_FAILURE;
                }
@@ -263,7 +263,7 @@ main( int argc, char **argv )
        }
 
        if( use_tls ) {
-               if( version != -1 || version != LDAP_VERSION3 ) {
+               if( version != -1 && version != LDAP_VERSION3 ) {
                        fprintf(stderr, "Start TLS requires LDAPv3\n");
                        return EXIT_FAILURE;
                }

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 034b611b7ca14915ab03266757f650a6ea89318f..353e1928393e891ef51f7f0f5038feaa33bf8337 100644 (file)
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -307,7 +307,7 @@ main( int argc, char **argv )
                version = LDAP_VERSION2;
        }
        else if ( authmethod == LDAP_AUTH_SASL ) {
-               if( version != -1 || version != LDAP_VERSION3 ) {
+               if( version != -1 && version != LDAP_VERSION3 ) {
                        fprintf( stderr, "SASL requires LDAPv3\n" );
                        return( EXIT_FAILURE );
                }
@@ -315,7 +315,7 @@ main( int argc, char **argv )
        }
 
        if( manageDSAit ) {
-               if( version != -1 || version != LDAP_VERSION3 ) {
+               if( version != -1 && version != LDAP_VERSION3 ) {
                        fprintf(stderr, "manage DSA control requires LDAPv3\n");
                        return EXIT_FAILURE;
                }
@@ -323,7 +323,7 @@ main( int argc, char **argv )
        }
 
        if( use_tls ) {
-               if( version != -1 || version != LDAP_VERSION3 ) {
+               if( version != -1 && version != LDAP_VERSION3 ) {
                        fprintf(stderr, "Start TLS requires LDAPv3\n");
                        return EXIT_FAILURE;
                }

diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index 360bb20c2b20504d988a6bdde773c1b488c9dc5c..fbfa2f75b13bc9f2f8dda36bf50b45d2fa8247bb 100644 (file)
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -263,7 +263,7 @@ main(int argc, char **argv)
                version = LDAP_VERSION2;
        }
        else if ( authmethod == LDAP_AUTH_SASL ) {
-               if( version != -1 || version != LDAP_VERSION3 ) {
+               if( version != -1 && version != LDAP_VERSION3 ) {
                        fprintf( stderr, "SASL requires LDAPv3\n" );
                        return( EXIT_FAILURE );
                }
@@ -271,7 +271,7 @@ main(int argc, char **argv)
        }
 
        if( manageDSAit ) {
-               if( version != -1 || version != LDAP_VERSION3 ) {
+               if( version != -1 && version != LDAP_VERSION3 ) {
                        fprintf(stderr, "manage DSA control requires LDAPv3\n");
                        return EXIT_FAILURE;
                }
@@ -279,7 +279,7 @@ main(int argc, char **argv)
        }
 
        if( use_tls ) {
-               if( version != -1 || version != LDAP_VERSION3 ) {
+               if( version != -1 && version != LDAP_VERSION3 ) {
                        fprintf(stderr, "Start TLS requires LDAPv3\n");
                        return EXIT_FAILURE;
                }

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index f7d050422b45d05b4c7a1280a6324e5d5cce26fd..68f9b947a4c72794f41d8055acd068d83f7ead3d 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -378,7 +378,7 @@ main( int argc, char **argv )
                version = LDAP_VERSION2;
        }
        else if ( authmethod == LDAP_AUTH_SASL ) {
-               if( version != -1 || version != LDAP_VERSION3 ) {
+               if( version != -1 && version != LDAP_VERSION3 ) {
                        fprintf( stderr, "SASL requires LDAPv3\n" );
                        return( EXIT_FAILURE );
                }
@@ -386,7 +386,7 @@ main( int argc, char **argv )
        }
 
        if( manageDSAit ) {
-               if( version != -1 || version != LDAP_VERSION3 ) {
+               if( version != -1 && version != LDAP_VERSION3 ) {
                        fprintf(stderr, "manage DSA control requires LDAPv3\n");
                        return EXIT_FAILURE;
                }
@@ -394,7 +394,7 @@ main( int argc, char **argv )
        }
 
        if( use_tls ) {
-               if( version != -1 || version != LDAP_VERSION3 ) {
+               if( version != -1 && version != LDAP_VERSION3 ) {
                        fprintf(stderr, "Start TLS requires LDAPv3\n");
                        return EXIT_FAILURE;
                }