Changeset 620 for trunk/server/source3/nmbd/nmbd_packets.c

Timestamp:

Aug 6, 2011, 6:50:53 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.11

File:

• trunk/server/source3/nmbd/nmbd_packets.c (modified) (2 diffs)

trunk/server/source3/nmbd/nmbd_packets.c

@@ -1730 +1730 @@
                 if (subrec->nmb_sock < 0 || subrec->nmb_sock >= FD_SETSIZE) {
                         /* We have to ignore sockets outside FD_SETSIZE. */
-                        continue;
-                }
-                FD_SET(subrec->nmb_sock,pset);
-                sock_array[num++] = subrec->nmb_sock;
-                *maxfd = MAX( *maxfd, subrec->nmb_sock);
+                        sock_array[num++] = -1;
+                } else {
+                        FD_SET(subrec->nmb_sock,pset);
+                        sock_array[num++] = subrec->nmb_sock;
+                        *maxfd = MAX( *maxfd, subrec->nmb_sock);
+                }
 
                 if (subrec->nmb_bcast < 0 || subrec->nmb_bcast >= FD_SETSIZE) {
                         /* We have to ignore sockets outside FD_SETSIZE. */
-                        continue;
-                }
-                sock_array[num++] = subrec->nmb_bcast;
-                FD_SET(subrec->nmb_bcast,pset);
-                *maxfd = MAX( *maxfd, subrec->nmb_bcast);
+                        sock_array[num++] = -1;
+                } else {
+                        sock_array[num++] = subrec->nmb_bcast;
+                        if (subrec->nmb_bcast != -1) {
+                                FD_SET(subrec->nmb_bcast,pset);
+                                *maxfd = MAX( *maxfd, subrec->nmb_bcast);
+                        }
+                }
         }
 
@@ -1762 +1766 @@
                 if (subrec->dgram_sock < 0 || subrec->dgram_sock >= FD_SETSIZE) {
                         /* We have to ignore sockets outside FD_SETSIZE. */
-                        continue;
-                }
-                FD_SET(subrec->dgram_sock,pset);
-                sock_array[num++] = subrec->dgram_sock;
-                *maxfd = MAX( *maxfd, subrec->dgram_sock);
+                        sock_array[num++] = -1;
+                } else {
+                        FD_SET(subrec->dgram_sock,pset);
+                        sock_array[num++] = subrec->dgram_sock;
+                        *maxfd = MAX( *maxfd, subrec->dgram_sock);
+                }
 
                 if (subrec->dgram_bcast < 0 || subrec->dgram_bcast >= FD_SETSIZE) {
                         /* We have to ignore sockets outside FD_SETSIZE. */
-                        continue;
-                }
-                sock_array[num++] = subrec->dgram_bcast;
-                if (subrec->dgram_bcast != -1) {
-                        FD_SET(subrec->dgram_bcast,pset);
-                        *maxfd = MAX( *maxfd, subrec->dgram_bcast);
-                }
-        }
+                        sock_array[num++] = -1;
+                } else {
+                        sock_array[num++] = subrec->dgram_bcast;
+                        if (subrec->dgram_bcast != -1) {
+                                FD_SET(subrec->dgram_bcast,pset);
+                                *maxfd = MAX( *maxfd, subrec->dgram_bcast);
+                        }
+                }
+        }
+
+        SMB_ASSERT(count == num);
 
         *listen_number = count;