diff options
| author | ghen <ghen> | 2006-07-11 07:34:35 +0000 |
|---|---|---|
| committer | ghen <ghen> | 2006-07-11 07:34:35 +0000 |
| commit | 5e43036d9b3ef88003fbcf11e688b2b4b2271834 (patch) | |
| tree | 0bd271a2166da4b92d908a458ff2b615dcc31dc5 /net | |
| parent | 3dba16a079481d610397f68df04da4b59f3b19bc (diff) | |
| download | pkgsrc-5e43036d9b3ef88003fbcf11e688b2b4b2271834.tar.gz | |
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 (limited to 'net')
| -rw-r--r-- | net/samba/Makefile | 4 | ||||
| -rw-r--r-- | net/samba/distinfo | 3 | ||||
| -rw-r--r-- | net/samba/patches/patch-cd | 19 |
3 files changed, 23 insertions, 3 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index 1bd6ae0217c..94c34b8a62e 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -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 --git a/net/samba/distinfo b/net/samba/distinfo index f2a6b569b61..3092f3aac3a 100644 --- a/net/samba/distinfo +++ b/net/samba/distinfo @@ -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-bx) = b46172b1e7e4937039b894eff7caf6dff5cbba62 SHA1 (patch-by) = adc269c07d06108fe77afbb65d5eb309fc4d6d67 SHA1 (patch-bz) = 143ff731caced00aa6ba589a1d83581a7449b853 SHA1 (patch-ca) = 4863e5d3dbf01c92443464e9a3b01720859aca05 +SHA1 (patch-cd) = 1ff0792f57b702bc4c6fe82867876534d3ba35a6 diff --git a/net/samba/patches/patch-cd b/net/samba/patches/patch-cd new file mode 100644 index 00000000000..732310c8192 --- /dev/null +++ b/net/samba/patches/patch-cd @@ -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) { |