diff options
| author | joerg <joerg@pkgsrc.org> | 2012-11-19 02:59:06 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2012-11-19 02:59:06 +0000 |
| commit | ced4d9dcf7982f3baefa585007c1a6ef831d7e24 (patch) | |
| tree | 47b095a536690959ce7c8e076e6936f37e84314e /net | |
| parent | 08e8f0060df1234288d1158cdf86e784eed11d2e (diff) | |
| download | pkgsrc-ced4d9dcf7982f3baefa585007c1a6ef831d7e24.tar.gz | |
Correctly return an error value when bailing out.
Diffstat (limited to 'net')
| -rw-r--r-- | net/samba30/distinfo | 4 | ||||
| -rw-r--r-- | net/samba30/patches/patch-ee | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/samba30/distinfo b/net/samba30/distinfo index 1a0c1be51b7..56c95effceb 100644 --- a/net/samba30/distinfo +++ b/net/samba30/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2012/04/11 10:03:37 asau Exp $ +$NetBSD: distinfo,v 1.4 2012/11/19 02:59:06 joerg Exp $ SHA1 (samba-3.0.37-CVE-2012-1182.patch) = 0d90e57897fa6c2fefdd88dd8a6daa0c87302110 RMD160 (samba-3.0.37-CVE-2012-1182.patch) = 417e58c300df8b6771bd93674fee1b96c9f3a933 @@ -42,6 +42,6 @@ SHA1 (patch-cg) = 2755a019759826a39c3e201f6a0d1646e6dd2fba SHA1 (patch-ch) = 3c4c404519154e294cee134ddb4d2b9c7d8e02a2 SHA1 (patch-ci) = d78298d0997cf7877cfe2411355fb6c61dec17f6 SHA1 (patch-da) = 2dddd250b2207d658b02ff43b46199ce4305b7f8 -SHA1 (patch-ee) = b5bae1f8ebbd02cae70a5d7a8faef8ad5e5896ac +SHA1 (patch-ee) = de566f59361037bc759fc8bea2b34a928db33b93 SHA1 (patch-lib_replace_test_os2__delete.c) = 27958a98f37fdc03e109c641d768721e4e587f31 SHA1 (patch-libsmb_clikrb5.c) = 0efe8e7b06588a727b8cf459ed6e9dc46d1b8f13 diff --git a/net/samba30/patches/patch-ee b/net/samba30/patches/patch-ee index f6b8f93d554..4b290f448e6 100644 --- a/net/samba30/patches/patch-ee +++ b/net/samba30/patches/patch-ee @@ -1,4 +1,4 @@ -$NetBSD: patch-ee,v 1.2 2012/03/13 13:23:18 taca Exp $ +$NetBSD: patch-ee,v 1.3 2012/11/19 02:59:06 joerg Exp $ Patch to fix CVE-2010-2063 and CVE-2012-0870. @@ -26,7 +26,7 @@ Patch to fix CVE-2010-2063 and CVE-2012-0870. + if (SVAL(inbuf,smb_vwv1) <= smb_off2) { + DEBUG(1, ("AndX offset not increasing\n")); + SCVAL(outbuf, smb_vwv0, 0xFF); -+ return; ++ return -1; + } + smb_off2 = SVAL(inbuf, smb_vwv1); + |