From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 30 Aug 2002 05:10:41 +0000 (+0000)
Subject: More noop #ifdef'ing
X-Git-Tag: NO_SLAP_OP_BLOCKS~1092
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4026d3ee80f29aa45bcc0d2c09dd3b06236839b2;p=openldap

More noop #ifdef'ing
---

diff --git a/clients/tools/ldapcompare.c b/clients/tools/ldapcompare.c
index 7451b9d7d7..b83b618f6a 100644
--- a/clients/tools/ldapcompare.c
+++ b/clients/tools/ldapcompare.c
@@ -209,6 +209,7 @@ main( int argc, char **argv )
 			free( control );
 			break;
 			
+#ifdef LDAP_CONTROL_NOOP
 		} else if ( strcasecmp( control, "noop" ) == 0 ) {
 			if( cvalue != NULL ) {
 				fprintf( stderr, "noop: no control value expected" );
@@ -219,6 +220,7 @@ main( int argc, char **argv )
 			noop = 1 + crit;
 			free( control );
 			break;
+#endif
 
 		} else {
 			fprintf( stderr, "Invalid general control name: %s\n", control );
@@ -731,7 +733,11 @@ main( int argc, char **argv )
 		}
 	}
 
-	if ( manageDSAit || noop ) {
+	if ( manageDSAit
+#ifdef LDAP_CONTROL_NOOP
+		|| noop
+#endif
+	) {
 		int err, i = 0;
 		LDAPControl c1, c2;
 		LDAPControl *ctrls[3];
@@ -745,6 +751,7 @@ main( int argc, char **argv )
 			c1.ldctl_iscritical = manageDSAit > 1;
 		}
 
+#ifdef LDAP_CONTROL_NOOP
 		if ( noop ) {
 			ctrls[i++] = &c2;
 			ctrls[i] = NULL;
@@ -754,6 +761,7 @@ main( int argc, char **argv )
 			c2.ldctl_value.bv_len = 0;
 			c2.ldctl_iscritical = noop > 1;
 		}
+#endif
 	
 		err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, ctrls );