svn commit: samba r16925 - in branches/SAMBA_3_0_RELEASE: .
packaging/bin source/smbd
jerry at samba.org
jerry at samba.org
Mon Jul 10 20:37:41 GMT 2006
Author: jerry
Date: 2006-07-10 20:37:40 +0000 (Mon, 10 Jul 2006)
New Revision: 16925
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16925
Log:
final changes for 3.0.23
Modified:
branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
branches/SAMBA_3_0_RELEASE/packaging/bin/update-pkginfo
branches/SAMBA_3_0_RELEASE/source/smbd/service.c
Changeset:
Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt
===================================================================
--- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-07-10 19:06:30 UTC (rev 16924)
+++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2006-07-10 20:37:40 UTC (rev 16925)
@@ -1,6 +1,6 @@
==============================
Release Notes for Samba 3.0.23
- Jun XX, 2006
+ Jul 10, 2006
==============================
This is the latest stable release of Samba. This is the version
@@ -203,6 +203,7 @@
* Fix compile warnings when passing NULL to snprintf().
* BUG 3915: Fall back to a pure unix user with S-1-22 SIDs in the
token in case anything weird is going on with the 'force user'.
+ * CVE-2006-3403: Fix minor memory exhaustion DoS in smbd.
o Jason Mader <jason at ncac.gwu.edu>
Modified: branches/SAMBA_3_0_RELEASE/packaging/bin/update-pkginfo
===================================================================
--- branches/SAMBA_3_0_RELEASE/packaging/bin/update-pkginfo 2006-07-10 19:06:30 UTC (rev 16924)
+++ branches/SAMBA_3_0_RELEASE/packaging/bin/update-pkginfo 2006-07-10 20:37:40 UTC (rev 16925)
@@ -4,6 +4,12 @@
RELEASE=$2
REVISION=$3
+if [ "x${REVISION}" = "x" ]; then
+ RPMREVISION=""
+else
+ RPMREVISION=".${REVISION}"
+fi
+
if [ $# -ne 3 ]; then
echo Usage: update-pkginfo VERSION RELEASE REVISION
exit 1
@@ -17,6 +23,6 @@
sed -e s/PVERSION/$VERSION/g \
-e s/PRELEASE/$RELEASE/g \
-e s/PREVISION/${REVISION}/g \
- -e s/PRPMREV/.${REVISION}/g < $f > $f2
+ -e s/PRPMREV/${RPMREVISION}/g < $f > $f2
done
Modified: branches/SAMBA_3_0_RELEASE/source/smbd/service.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/smbd/service.c 2006-07-10 19:06:30 UTC (rev 16924)
+++ branches/SAMBA_3_0_RELEASE/source/smbd/service.c 2006-07-10 20:37:40 UTC (rev 16925)
@@ -1014,6 +1014,11 @@
smb_panic("make_connection: PANIC ERROR. Called as nonroot\n");
}
+ if (conn_num_open() > 2047) {
+ *status = NT_STATUS_INSUFF_SERVER_RESOURCES;
+ return NULL;
+ }
+
if(lp_security() != SEC_SHARE) {
vuser = get_valid_user_struct(vuid);
if (!vuser) {
More information about the samba-cvs
mailing list