[SCM] Samba Shared Repository - branch v3-3-test updated
Karolin Seeger
kseeger at samba.org
Mon Jul 4 13:54:29 MDT 2011
The branch, v3-3-test has been updated
via d9c0ace s3:nmbd_packets: return the used number of sockets in create_listen_fdset() (bug #8276)
from 57efe48 WHATSNEW: Prepare 3.3.15 release notes.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit d9c0ace4311560a6f4a4df6d722b143a58cc6e9d
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-3-test.
metze
-----------------------------------------------------------------------
Summary of changes:
source/nmbd/nmbd_packets.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nmbd/nmbd_packets.c b/source/nmbd/nmbd_packets.c
index 03e5362..bb65e39 100644
--- a/source/nmbd/nmbd_packets.c
+++ b/source/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