X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fldapd%2Fresult.c;h=777aec2e68a6da5459f40fb949c957e6dcc324ca;hb=c9eacbdc6407b65b395c13e1e93e8fe25bbbf041;hp=22eb9b933ca5c6e0f61c4f7b99f3ed4f62eefcae;hpb=2a869f5a99f537b246ba8640502e2a86117cb6e8;p=openldap

diff --git a/servers/ldapd/result.c b/servers/ldapd/result.c
index 22eb9b933c..777aec2e68 100644
--- a/servers/ldapd/result.c
+++ b/servers/ldapd/result.c
@@ -23,14 +23,10 @@
 #include <quipu/dua.h>
 
 #include "lber.h"
+#include "../../libraries/liblber/lber-int.h"	/* get struct berelement */
 #include "ldap.h"
 #include "common.h"
 
-extern int	dosyslog;
-#ifdef LDAP_COMPAT
-extern int	ldap_compat;
-#endif
-
 /*
  * dsa_response - called by do_queries() when there is activity on one of
  * the DSA associations.  It is passed the association descriptor on which
@@ -284,12 +280,12 @@ send_ldap_msgresult(
 {
 #ifdef LDAP_CONNECTIONLESS
 	if ( m->m_cldap ) {
-		SAFEMEMCPY( (char *)sb->sb_useaddr, &m->m_clientaddr,
-		    sizeof( struct sockaddr ));
+	   	lber_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 ) );
@@ -309,11 +305,7 @@ send_ldap_result(
 	int		rc;
 #ifdef LDAP_CONNECTIONLESS
 	int		cldap;
-#endif
-	extern int	version;
-
-#ifdef LDAP_CONNECTIONLESS
-	cldap = ( sb->sb_naddr > 0 );
+	cldap = ( sb->sb_io == &lber_pvt_sb_io_udp );
 #endif
 
 	Debug( LDAP_DEBUG_TRACE, "send_ldap_result\n", 0, 0, 0 );