s3:nmbd_packets: return the used number of sockets in create_listen_fdset() (bug...
authorStefan Metzmacher <metze@samba.org>
Thu, 30 Jun 2011 07:56:06 +0000 (09:56 +0200)
committerKarolin Seeger <kseeger@samba.org>
Thu, 18 Aug 2011 19:15:21 +0000 (21:15 +0200)
Fix bug #7949 (DoS in Winbind and smbd with many file descriptors open)
(commit feb3fcd0fa4bda0967b881315595d7702f4d1752) changed the bahavior,
so that we skipped some sockets.

This should work for v3-4-test.

metze
(cherry picked from commit 11b4dec29c9306531e73d5f4c12f89934dd538b4)

source3/nmbd/nmbd_packets.c

index 1c570ea617dbeedfa2d86bda4f4edd1833373d9f..855f6af596af75aed68d15fd75fcfabe2d173ea6 100644 (file)
@@ -1742,7 +1742,7 @@ only use %d.\n", (count*2) + 2, FD_SETSIZE));
                *maxfd = MAX( *maxfd, subrec->dgram_sock);
        }
 
-       *listen_number = (count*2) + 2;
+       *listen_number = num;
 
        SAFE_FREE(*ppset);
        SAFE_FREE(*psock_array);