Changeset 593 for trunk/server/nsswitch

Timestamp:

Jul 1, 2011, 10:18:23 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.7

Location:

trunk/server/nsswitch

Files:

• libwbclient/wbc_async.c (modified) (1 diff)
• wb_common.c (modified) (3 diffs)

trunk/server/nsswitch/libwbclient/wbc_async.c

@@ -510 +510 @@
         int selret;
 
-        if (fd == -1) {
+        if (fd < 0 || fd >= FD_SETSIZE) {
                 return true;
         }

trunk/server/nsswitch/wb_common.c

@@ -245 +245 @@
                         case EINPROGRESS:
                                 FD_ZERO(&w_fds);
+                                if (fd < 0 || fd >= FD_SETSIZE) {
+                                        errno = EBADF;
+                                        goto error_out;
+                                }
                                 FD_SET(fd, &w_fds);
                                 tv.tv_sec = CONNECT_TIMEOUT - wait_time;
@@ -392 +396 @@
 
                 FD_ZERO(&r_fds);
+                if (winbindd_fd < 0 || winbindd_fd >= FD_SETSIZE) {
+                        errno = EBADF;
+                        winbind_close_sock();
+                        return -1;
+                }
                 FD_SET(winbindd_fd, &r_fds);
                 ZERO_STRUCT(tv);
@@ -452 +461 @@
 
                 FD_ZERO(&r_fds);
+                if (winbindd_fd < 0 || winbindd_fd >= FD_SETSIZE) {
+                        errno = EBADF;
+                        winbind_close_sock();
+                        return -1;
+                }
                 FD_SET(winbindd_fd, &r_fds);
                 ZERO_STRUCT(tv);