Merge remote-tracking branch 'origin/mdb.master'

[openldap] / libraries / libldap / open.c

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 24d8a41e0b30803b8577db64c8b7864edc4c641a..ba10939975986ccb6ada670cffe923ac4ea3969f 100644 (file)
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -268,6 +268,9 @@ ldap_init_fd(
        int rc;
        LDAP *ld;
        LDAPConn *conn;
+#ifdef LDAP_CONNECTIONLESS
+       ber_socklen_t   len;
+#endif
 
        *ldp = NULL;
        rc = ldap_create( &ld );
@@ -308,6 +311,15 @@ ldap_init_fd(
 
 #ifdef LDAP_CONNECTIONLESS
        case LDAP_PROTO_UDP:
+               LDAP_IS_UDP(ld) = 1;
+               if( ld->ld_options.ldo_peer )
+                       ldap_memfree( ld->ld_options.ldo_peer );
+               ld->ld_options.ldo_peer = ldap_memalloc( sizeof( struct sockaddr ) );
+               len = sizeof( struct sockaddr );
+               if( getpeername ( fd, ld->ld_options.ldo_peer, &len ) < 0) {
+                       ldap_unbind_ext( ld, NULL, NULL );
+                       return( AC_SOCKET_ERROR );
+               }
 #ifdef LDAP_DEBUG
                ber_sockbuf_add_io( conn->lconn_sb, &ber_sockbuf_io_debug,
                        LBER_SBIOD_LEVEL_PROVIDER, (void *)"udp_" );