[Pkg-samba-maint] r1248 - in branches/sarge: . patches

[Christian Perrier]

Author: bubulle
Date: 2007-02-12 22:18:19 +0100 (Mon, 12 Feb 2007)
New Revision: 1248

Added:
   branches/sarge/patches/security-CVE-2006-3403.patch
Removed:
   branches/sarge/patches/samba-3.0-CAN-2006-3403.patch
Modified:
   branches/sarge/changelog
   branches/sarge/control
Log:
Update to the real 3.0.14a-3sarge2 version


Modified: branches/sarge/changelog
===================================================================
--- branches/sarge/changelog	2007-02-12 21:06:09 UTC (rev 1247)
+++ branches/sarge/changelog	2007-02-12 21:18:19 UTC (rev 1248)
@@ -1,10 +1,9 @@
 samba (3.0.14a-3sarge2) stable-security; urgency=high
 
-  * High-urgency upload for security fix.
-  * Added debian/patches/samba-3.0-CAN-2006-3403.patch: fix for
-    CAN-2006-3403, memory exhaustion DoS agaisnt smbd.  Closes: #378070.
+  * Non-maintainer upload by the Security Team:
+    Fix anonymous memory exhaustion DoS. [CVE-2006-3403]
 
- -- Steve Langasek <vorlon at debian.org>  Thu, 13 Jul 2006 03:26:08 -0700
+ -- Moritz Muehlenhoff <jmm at debian.org>  Thu, 13 Jul 2006 20:44:12 +0200
 
 samba (3.0.14a-3sarge1) stable; urgency=low
 

Modified: branches/sarge/control
===================================================================
--- branches/sarge/control	2007-02-12 21:06:09 UTC (rev 1247)
+++ branches/sarge/control	2007-02-12 21:18:19 UTC (rev 1248)
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Eloy A. Paris <peloy at debian.org>
-Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>
+Uploaders: Steve Langasek <vorlon at debian.org>
 Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline4-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), autoconf, libacl1-dev (>= 2.2.11-1) [alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 s390x sh3 sh3eb sh4 sh4eb sparc sparc64 amd64], libkrb5-dev, libldap2-dev, po-debconf, python2.3-dev, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1)
 Standards-Version: 3.5.10
 

Deleted: branches/sarge/patches/samba-3.0-CAN-2006-3403.patch
===================================================================
--- branches/sarge/patches/samba-3.0-CAN-2006-3403.patch	2007-02-12 21:06:09 UTC (rev 1247)
+++ branches/sarge/patches/samba-3.0-CAN-2006-3403.patch	2007-02-12 21:18:19 UTC (rev 1248)
@@ -1,17 +0,0 @@
-Index: samba-3.0.14a/source/smbd/service.c
-===================================================================
---- samba-3.0.14a/source/smbd/service.c (revision 16676)
-+++ samba-3.0.14a/source/smbd/service.c (working copy)
-@@ -763,6 +763,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) {
-

Added: branches/sarge/patches/security-CVE-2006-3403.patch
===================================================================
--- branches/sarge/patches/security-CVE-2006-3403.patch	2007-02-12 21:06:09 UTC (rev 1247)
+++ branches/sarge/patches/security-CVE-2006-3403.patch	2007-02-12 21:18:19 UTC (rev 1248)
@@ -0,0 +1,14 @@
+--- samba-3.0.14a/source/smbd/service.c	(revision 16676)
++++ samba-3.0.14a/source/smbd/service.c	(working copy)
+@@ -763,6 +763,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) {