Changeset 165 for branches/samba-3.0/source/nsswitch/winbind_nss_solaris.c

Timestamp:

Mar 11, 2009, 9:14:55 AM (17 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

File:

• branches/samba-3.0/source/nsswitch/winbind_nss_solaris.c (modified) (9 diffs)

branches/samba-3.0/source/nsswitch/winbind_nss_solaris.c

@@ -361 +361 @@
         int len = 0;
         struct in_addr *addrp;
+
         struct in6_addr *addrp6;
+
         int i;
 
@@ -393 +395 @@
                 he->h_addr_list = (char **)ROUND_DOWN(addrp, sizeof (char*));
                 he->h_addr_list -= addrcount+1;
-        } else {
+        }
+#if defined(AF_INET6)
+        else {
                 he->h_length = sizeof(struct in6_addr);
                 addrp6 = (struct in6_addr *)ROUND_DOWN(buffer + buflen,
@@ -401 +405 @@
                 he->h_addr_list -= addrcount+1;
         }
+
 
         /* buffer too small?! */
@@ -420 +425 @@
                     return NSS_STR_PARSE_ERANGE;
                   }
-                } else {
+                }
+#if defined(AF_INET6)
+                else {
                   he->h_addr_list[i] = (char *)&addrp6[i];
                   if (strchr(data, ':') != 0) {
@@ -436 +443 @@
                   }
                 }
+
                 data = p+1;
         }
@@ -483 +491 @@
            IPv4 to IPv6.
          */
+
 #ifdef HAVE_NSS_XBYY_KEY_IPNODE
         af = argp->key.ipnode.af_family;
@@ -493 +502 @@
         af = AF_INET6;
 #endif
+
 
         strncpy(request.data.winsreq, argp->key.name, sizeof(request.data.winsreq) - 1);
@@ -541 +551 @@
         ZERO_STRUCT(request);
 
+
         /* winbindd currently does not resolve IPv6 */
         if(argp->key.hostaddr.type == AF_INET6) {
@@ -548 +559 @@
 
         p = inet_ntop(argp->key.hostaddr.type, argp->key.hostaddr.addr,
-                        request.data.winsreq, INET6_ADDRSTRLEN);
+                        request.data.winsreq, sizeof request.data.winsreq);
+#else
+        snprintf(request.data.winsreq, sizeof request.data.winsreq,
+                "%u.%u.%u.%u", 
+                ((unsigned char *)argp->key.hostaddr.addr)[0],
+                ((unsigned char *)argp->key.hostaddr.addr)[1],
+                ((unsigned char *)argp->key.hostaddr.addr)[2],
+                ((unsigned char *)argp->key.hostaddr.addr)[3]);
+#endif
 
         ret = winbindd_request_response(WINBINDD_WINS_BYIP, &request, &response);