diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index ce8c3f5d3c..fc2f4d0631 100644
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -367,6 +367,9 @@ ldap_send_server_request(
 	}
 
 	/* Extract requestDN for future reference */
+#ifdef LDAP_CONNECTIONLESS
+	if ( !LDAP_IS_UDP(ld) )
+#endif
 	{
 		BerElement tmpber = *ber;
 		ber_int_t	bint;