Replace NULLBER with NULL

[openldap] / servers / ldapd / result.c

diff --git a/servers/ldapd/result.c b/servers/ldapd/result.c
index 498ef4a7013862e29b7762477030abb089c58b94..a046a4e62008c029e8cdd3fd1669433af03ca564 100644 (file)
--- a/servers/ldapd/result.c
+++ b/servers/ldapd/result.c
@@ -280,12 +280,12 @@ send_ldap_msgresult(
 {
 #ifdef LDAP_CONNECTIONLESS
        if ( m->m_cldap ) {
-               SAFEMEMCPY( (char *)sb->sb_useaddr, &m->m_clientaddr,
-                   sizeof( struct sockaddr ));
+               ber_pvt_sb_udp_set_dst( &sb, &m->m_clientaddr );
+
                Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n", 
                    inet_ntoa(((struct sockaddr_in *)
-                   sb->sb_useaddr)->sin_addr ),
-                   ((struct sockaddr_in *)sb->sb_useaddr)->sin_port, 0 );
+                   &m->m_clientaddr)->sin_addr ),
+                   ((struct sockaddr_in *)&m->m_clientaddr)->sin_port, 0 );
        }
 #endif
        return( send_ldap_result( sb, tag, m->m_msgid, err, matched, text ) );
@@ -305,7 +305,7 @@ send_ldap_result(
        int             rc;
 #ifdef LDAP_CONNECTIONLESS
        int             cldap;
-       cldap = ( sb->sb_naddr > 0 );
+       cldap = ( sb->sb_io == &ber_pvt_sb_io_udp );
 #endif
 
        Debug( LDAP_DEBUG_TRACE, "send_ldap_result\n", 0, 0, 0 );
@@ -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 );
        }