[pkgsrc/trunk]: pkgsrc/net/samba Apply the patch from http://www.samba.org/sa...

[ghen <ghen%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cbd99c414fae
branches:  trunk
changeset: 515933:cbd99c414fae
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Tue Jul 11 07:34:35 2006 +0000

description:
Apply the patch from http://www.samba.org/samba/security/CAN-2006-3403.html
to fix a memory exhaustion DoS against smbd.  Bump PKGREVISION.

diffstat:

 net/samba/Makefile         |   4 ++--
 net/samba/distinfo         |   3 ++-
 net/samba/patches/patch-cd |  19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diffs (52 lines):

diff -r f2c6e9346b6e -r cbd99c414fae net/samba/Makefile
--- a/net/samba/Makefile        Tue Jul 11 05:03:11 2006 +0000
+++ b/net/samba/Makefile        Tue Jul 11 07:34:35 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.161 2006/05/03 23:23:06 jlam Exp $
+# $NetBSD: Makefile,v 1.162 2006/07/11 07:34:35 ghen Exp $
 
 .include "Makefile.mirrors"
 
 DISTNAME=              samba-3.0.22
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            net
 MASTER_SITES=          ${SAMBA_MIRRORS:=old-versions/}
 DIST_SUBDIR=           ${DISTNAME}
diff -r f2c6e9346b6e -r cbd99c414fae net/samba/distinfo
--- a/net/samba/distinfo        Tue Jul 11 05:03:11 2006 +0000
+++ b/net/samba/distinfo        Tue Jul 11 07:34:35 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.48 2006/04/01 04:55:35 jlam Exp $
+$NetBSD: distinfo,v 1.49 2006/07/11 07:34:35 ghen Exp $
 
 SHA1 (samba-3.0.22/samba-3.0.22.tar.gz) = 76eba872b3e8f647e16d0d8d129e02848a7989d7
 RMD160 (samba-3.0.22/samba-3.0.22.tar.gz) = b41cffc999c524c1650d2dd3fbd063dc79741091
@@ -48,3 +48,4 @@
 SHA1 (patch-by) = adc269c07d06108fe77afbb65d5eb309fc4d6d67
 SHA1 (patch-bz) = 143ff731caced00aa6ba589a1d83581a7449b853
 SHA1 (patch-ca) = 4863e5d3dbf01c92443464e9a3b01720859aca05
+SHA1 (patch-cd) = 1ff0792f57b702bc4c6fe82867876534d3ba35a6
diff -r f2c6e9346b6e -r cbd99c414fae net/samba/patches/patch-cd
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/samba/patches/patch-cd        Tue Jul 11 07:34:35 2006 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-cd,v 1.1 2006/07/11 07:34:35 ghen Exp $
+
+Security patch from http://www.samba.org/samba/security/CAN-2006-3403.html
+(fixes a memory exhaustion DoS against smbd).
+
+--- source/smbd/service.c.orig 2006-01-25 00:46:32.000000000 +0100
++++ source/smbd/service.c
+@@ -763,6 +763,11 @@ connection_struct *make_connection(const
+               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) {