X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=clients%2Ftools%2Fldapmodify.c;h=86343417ce105bbf48d86cd471c1256dc143a872;hb=ebfe58344c63a5fd99caf37f72a6acf02e6afc0e;hp=034b611b7ca14915ab03266757f650a6ea89318f;hpb=4ecf780e48f3f73a62c8e61360d5b5e0548b3173;p=openldap

diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 034b611b7c..86343417ce 100644
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* ldapmodify.c - generic program to modify or add entries using LDAP */
@@ -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;
 		}