From: Hallvard Furuseth <hallvard@openldap.org>
Date: Tue, 3 Aug 1999 02:31:29 +0000 (+0000)
Subject: Replace NULLBER with NULL
X-Git-Tag: TWEB_OL_BASE~319
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=79fb44b129849ff2b3ec61568b6a3abf903bdc82;hp=0310b8b04852a0f9857cb1119c0e600b8753c099;p=openldap

Replace NULLBER with NULL
Replace `lber_int_debug = ...' with `ber_set_option( ... )'
---

diff --git a/servers/ldapd/main.c b/servers/ldapd/main.c
index d263202120..a4250faa96 100644
--- a/servers/ldapd/main.c
+++ b/servers/ldapd/main.c
@@ -154,7 +154,7 @@ main( int argc, char **argv )
 #ifdef LDAP_DEBUG
 			ldap_debug = atoi( optarg );
 			if ( ldap_debug & LDAP_DEBUG_PACKETS )
-				lber_int_debug = ldap_debug;
+				ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &ldap_debug );
 #else
 			fprintf( stderr, "Not compiled with -DLDAP_DEBUG!\n" );
 #endif
diff --git a/servers/ldapd/result.c b/servers/ldapd/result.c
index 3754251fa8..a046a4e620 100644
--- a/servers/ldapd/result.c
+++ b/servers/ldapd/result.c
@@ -317,7 +317,7 @@ send_ldap_result(
 		tag = LBER_SEQUENCE;
 #endif
 
-	if ( (ber = der_alloc()) == NULLBER ) {
+	if ( (ber = der_alloc()) == NULL ) {
 		Debug( LDAP_DEBUG_ANY, "der_alloc failed\n", 0, 0, 0 );
 		return( -1 );
 	}
diff --git a/servers/ldapd/search.c b/servers/ldapd/search.c
index 840772eb64..b57bdbe56c 100644
--- a/servers/ldapd/search.c
+++ b/servers/ldapd/search.c
@@ -552,7 +552,7 @@ search_result(
 
 #ifdef LDAP_CONNECTIONLESS
 	if ( m->m_cldap ) {
-		if ((ber = der_alloc()) == NULLBER ) {
+		if ((ber = der_alloc()) == NULL ) {
 			send_ldap_msgresult( sb, SEARCHRESTAG, m,
 			    LDAP_OPERATIONS_ERROR, NULL, "der_alloc" );
 			return;
@@ -573,7 +573,7 @@ search_result(
 		if ( !m->m_cldap )
 #endif /* LDAP_CONNECTIONLESS */
 
-			if ( (ber = der_alloc()) == NULLBER ) {
+			if ( (ber = der_alloc()) == NULL ) {
 				send_ldap_msgresult( sb, SEARCHRESTAG, m,
 				    LDAP_OPERATIONS_ERROR, NULL, "der_alloc" );
 				return;
diff --git a/servers/ldapd/syntax.c b/servers/ldapd/syntax.c
index 9d6032a84f..4658360289 100644
--- a/servers/ldapd/syntax.c
+++ b/servers/ldapd/syntax.c
@@ -439,7 +439,7 @@ put_photo_value( BerElement *ber, AttributeValue av )
 		len = ps_get_abs( pe );
 		Debug( LDAP_DEBUG_ARGS, "put_photo_val: ber_printf %d bytes\n",
 		    len, 0, 0 );
-		if (( phber = der_alloc()) == NULLBER ) {
+		if (( phber = der_alloc()) == NULL ) {
 			Debug( LDAP_DEBUG_ANY, "der_alloc failed\n", 0, 0, 0 );
 			return( -1 );
 		}