Update dn2domain to use str2dn() not explode_dn()

[openldap] / libraries / libldap / os-ip.c

diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index d549c7f324053acb01484899e92478ccd2c6deb1..5e4391178a735f74eecbd35d969ee034c4fe966d 100644 (file)
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -176,7 +176,11 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
 #else
 {
        /* error slippery */
+#ifdef LDAP_PF_INET6
+       struct sockaddr_storage sin;
+#else
        struct sockaddr_in sin;
+#endif
        char ch;
        socklen_t dummy = sizeof(sin);
        if ( getpeername( s, (struct sockaddr *) &sin, &dummy )
@@ -321,7 +325,6 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
        const char *host,
        unsigned long address, int port, int async )
 {
-       struct sockaddr_in      sin;
        ber_socket_t            s = AC_SOCKET_INVALID;
        int                     rc, i, use_hp = 0;
        struct hostent          *hp = NULL;
@@ -436,6 +439,8 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
 
        rc = s = -1;
        for ( i = 0; !use_hp || (hp->h_addr_list[i] != 0); ++i, rc = -1 ) {
+               struct sockaddr_in      sin;
+
                s = ldap_int_socket( ld, PF_INET, socktype );
                if ( s == AC_SOCKET_INVALID ) {
                        /* use_hp ? continue : break; */
@@ -447,7 +452,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
                        break;
                }
 
-               (void)memset((char *)&sin, '\0', sizeof(struct sockaddr_in));
+               (void)memset((char *)&sin, '\0', sizeof sin);
                sin.sin_family = AF_INET;
                sin.sin_port = htons((short) port);
                p = (char *)&sin.sin_addr;
@@ -482,7 +487,12 @@ ldap_host_connected_to( Sockbuf *sb )
 {
        struct hostent  *hp;
        socklen_t               len;
-       struct sockaddr sa;
+#ifdef LDAP_PF_INET6
+       struct sockaddr_storage sabuf;
+#else
+       struct sockaddr sabuf;
+#endif
+       struct sockaddr *sa = (struct sockaddr *) &sabuf;
        char                    *addr;
        char                    *host;
 
@@ -492,11 +502,11 @@ ldap_host_connected_to( Sockbuf *sb )
        char                    *ha_buf=NULL;
        ber_socket_t    sd;
 
-       (void)memset( (char *)&sa, '\0', sizeof( struct sockaddr ));
-       len = sizeof( sa );
+       (void)memset( (char *)sa, '\0', sizeof sabuf );
+       len = sizeof sabuf;
 
        ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_FD, &sd );
-       if ( getpeername( sd, &sa, &len ) == -1 ) {
+       if ( getpeername( sd, sa, &len ) == -1 ) {
                return( NULL );
        }
 
@@ -506,19 +516,19 @@ ldap_host_connected_to( Sockbuf *sb )
         * hostname is used as the kerberos instance.
         */
 
-       switch (sa.sa_family) {
+       switch (sa->sa_family) {
 #ifdef LDAP_PF_LOCAL
        case AF_LOCAL:
                return LDAP_STRDUP( ldap_int_hostname );
 #endif
 #ifdef LDAP_PF_INET6
        case AF_INET6:
-               addr = (char *) &((struct sockaddr_in6 *)&sa)->sin6_addr;
+               addr = (char *) &((struct sockaddr_in6 *)sa)->sin6_addr;
                len = sizeof( struct in6_addr );
                break;
 #endif
        case AF_INET:
-               addr = (char *) &((struct sockaddr_in *)&sa)->sin_addr;
+               addr = (char *) &((struct sockaddr_in *)sa)->sin_addr;
                len = sizeof( struct in_addr );
 
                {
@@ -526,7 +536,7 @@ ldap_host_connected_to( Sockbuf *sb )
                        localhost.sin_addr.s_addr = htonl( INADDR_ANY );
 
                        if( memcmp ( &localhost.sin_addr,
-                               &((struct sockaddr_in *)&sa)->sin_addr,
+                               &((struct sockaddr_in *)sa)->sin_addr,
                                sizeof(localhost.sin_addr) ) == 0 )
                        {
                                return LDAP_STRDUP( ldap_int_hostname );
@@ -536,7 +546,7 @@ ldap_host_connected_to( Sockbuf *sb )
                        localhost.sin_addr.s_addr = htonl( INADDR_LOOPBACK );
 
                        if( memcmp ( &localhost.sin_addr,
-                               &((struct sockaddr_in *)&sa)->sin_addr,
+                               &((struct sockaddr_in *)sa)->sin_addr,
                                sizeof(localhost.sin_addr) ) == 0 )
                        {
                                return LDAP_STRDUP( ldap_int_hostname );
@@ -551,9 +561,8 @@ ldap_host_connected_to( Sockbuf *sb )
        }
 
        host = NULL;
-       if ((ldap_pvt_gethostbyaddr_a( addr, len,
-               sa.sa_family, &he_buf, &ha_buf,
-               &hp,&local_h_errno ) == 0 ) &&
+       if ((ldap_pvt_gethostbyaddr_a( addr, len, sa->sa_family,
+               &he_buf, &ha_buf, &hp, &local_h_errno ) == 0 ) &&
                (hp != NULL) && ( hp->h_name != NULL ) )
        {
                host = LDAP_STRDUP( hp->h_name );