summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-06-30 09:56:06 +0200
committerKarolin Seeger <kseeger@samba.org>2011-07-04 21:53:42 +0200
commit11b4dec29c9306531e73d5f4c12f89934dd538b4 (patch)
tree556e8a26f948c86de12870a29df2dfbf539cf24d
parentc943af7ff13c64343e5246b27a7416627bffd365 (diff)
downloadsamba-11b4dec29c9306531e73d5f4c12f89934dd538b4.tar.gz
s3:nmbd_packets: return the used number of sockets in create_listen_fdset() (bug #8276)
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
-rw-r--r--source3/nmbd/nmbd_packets.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c
index 1c570ea617d..855f6af596a 100644
--- a/source3/nmbd/nmbd_packets.c
+++ b/source3/nmbd/nmbd_packets.c
@@ -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);