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 d2632021209092e18621d13e9909533270778e71..a4250faa968f8b2e284b867074b3e9c6e5bff5d3 100644 (file)
--- 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 3754251fa83c96e54c774ca6caa176fcbc182cd1..a046a4e62008c029e8cdd3fd1669433af03ca564 100644 (file)
--- 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 840772eb644d53cc7d185449385d8bedde42004b..b57bdbe56cc3b315ff1dfdd08f1390e569873f58 100644 (file)
--- 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 9d6032a84ff2a4ce1223a43ac6e076081f596cf7..4658360289214c5571c5d4ed68c0bc9204c1284b 100644 (file)
--- 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 );
                }