[SCM] Samba Shared Repository - branch v3-4-test updated
Karolin Seeger
kseeger at samba.org
Mon Jul 4 13:54:01 MDT 2011
The branch, v3-4-test has been updated
via 11b4dec s3:nmbd_packets: return the used number of sockets in create_listen_fdset() (bug #8276)
from c943af7 s3: increase the log level for missing PIDs on SIGCHLD
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit 11b4dec29c9306531e73d5f4c12f89934dd538b4
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Jun 30 09:56:06 2011 +0200
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
-----------------------------------------------------------------------
Summary of changes:
source3/nmbd/nmbd_packets.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c
index 1c570ea..855f6af 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);
--
Samba Shared Repository
More information about the samba-cvs
mailing list