Changeset 618 for vendor/current/source3/nmbd

Timestamp:

Aug 5, 2011, 7:52:23 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.11

Location:

vendor/current/source3/nmbd

Files:

• nmbd_packets.c (modified) (2 diffs)
• nmbd_subnetdb.c (modified) (1 diff)

vendor/current/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;

vendor/current/source3/nmbd/nmbd_subnetdb.c

@@ -56 +56 @@
 void close_subnet(struct subnet_record *subrec)
 {
+        if (subrec->nmb_sock != -1) {
+                close(subrec->nmb_sock);
+                subrec->nmb_sock = -1;
+        }
+        if (subrec->nmb_bcast != -1) {
+                close(subrec->nmb_bcast);
+                subrec->nmb_bcast = -1;
+        }
         if (subrec->dgram_sock != -1) {
                 close(subrec->dgram_sock);
                 subrec->dgram_sock = -1;
         }
-        if (subrec->nmb_sock != -1) {
-                close(subrec->nmb_sock);
-                subrec->nmb_sock = -1;
+        if (subrec->dgram_bcast != -1) {
+                close(subrec->dgram_bcast);
+                subrec->dgram_bcast = -1;
         }