Changeset 204 for branches/samba-3.2.x/source/nsswitch

Timestamp:

May 20, 2009, 6:46:53 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.4

Location:

branches/samba-3.2.x/source/nsswitch

Files:

• wb_common.c (modified) (8 diffs)
• winbind_nss_solaris.c (modified) (9 diffs)

branches/samba-3.2.x/source/nsswitch/wb_common.c

@@ -177 +177 @@
 
         if (lstat(dir, &st) == -1) {
+                errno = ENOENT;
                 return -1;
         }
@@ -182 +183 @@
         if (!S_ISDIR(st.st_mode) ||
             (st.st_uid != 0 && st.st_uid != geteuid())) {
+                errno = ENOENT;
                 return -1;
         }
@@ -200 +202 @@
 
         if (lstat(path, &st) == -1) {
+                errno = ENOENT;
                 SAFE_FREE(path);
                 return -1;
@@ -209 +212 @@
         if (!S_ISSOCK(st.st_mode) ||
             (st.st_uid != 0 && st.st_uid != geteuid())) {
+                errno = ENOENT;
                 return -1;
         }
@@ -369 +373 @@
         
         if (winbind_open_pipe_sock(recursing, need_priv) == -1) {
+                errno = ENOENT;
                 return -1;
         }
@@ -565 +570 @@
         if (winbind_write_sock(request, sizeof(*request),
                                request->wb_flags & WBFLAG_RECURSE,
-                               need_priv) == -1) {
+                               need_priv) == -1) 
+        {
+                /* Set ENOENT for consistency.  Required by some apps */
+                errno = ENOENT;
+                
                 return NSS_STATUS_UNAVAIL;
         }
@@ -573 +582 @@
                                 request->extra_len,
                                 request->wb_flags & WBFLAG_RECURSE,
-                                need_priv) == -1)) {
+                                need_priv) == -1)) 
+        {
+                /* Set ENOENT for consistency.  Required by some apps */
+                errno = ENOENT;
+
                 return NSS_STATUS_UNAVAIL;
         }
@@ -597 +610 @@
         /* Wait for reply */
         if (winbindd_read_reply(response) == -1) {
+                /* Set ENOENT for consistency.  Required by some apps */
+                errno = ENOENT;
+
                 return NSS_STATUS_UNAVAIL;
         }

branches/samba-3.2.x/source/nsswitch/winbind_nss_solaris.c

@@ -360 +360 @@
         int len = 0;
         struct in_addr *addrp;
+#if defined(AF_INET6)
         struct in6_addr *addrp6;
+#endif
         int i;
 
@@ -392 +394 @@
                 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,
@@ -400 +404 @@
                 he->h_addr_list -= addrcount+1;
         }
+#endif
 
         /* buffer too small?! */
@@ -419 +424 @@
                     return NSS_STR_PARSE_ERANGE;
                   }
-                } else {
+                }
+#if defined(AF_INET6)
+                else {
                   he->h_addr_list[i] = (char *)&addrp6[i];
                   if (strchr(data, ':') != 0) {
@@ -435 +442 @@
                   }
                 }
+#endif
                 data = p+1;
         }
@@ -482 +490 @@
            IPv4 to IPv6.
          */
+#if defined(AF_INET6)
 #ifdef HAVE_NSS_XBYY_KEY_IPNODE
         af = argp->key.ipnode.af_family;
@@ -492 +501 @@
         af = AF_INET6;
 #endif
+#endif
 
         strncpy(request.data.winsreq, argp->key.name, sizeof(request.data.winsreq) - 1);
@@ -540 +550 @@
         ZERO_STRUCT(request);
 
+#if defined(AF_INET6)
         /* winbindd currently does not resolve IPv6 */
         if(argp->key.hostaddr.type == AF_INET6) {
@@ -547 +558 @@
 
         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);