diff options
| author | tron <tron@pkgsrc.org> | 2012-01-30 15:48:11 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2012-01-30 15:48:11 +0000 |
| commit | cd0e8028e5db139dc3a9791f33f97bc8071ae8dd (patch) | |
| tree | 277ecfc40dd0537ef1eee9279bd3985e9ffb7a24 /net/samba | |
| parent | 908184df9b51b215cc961efada834e4876b111dd (diff) | |
| download | pkgsrc-cd0e8028e5db139dc3a9791f33f97bc8071ae8dd.tar.gz | |
Fix botch in last patch which meant that we were ignoring almost all
errors in response to SMB echo packets.
The new fix doesn't look particular nice but should at least do
The Right Thing(TM).
Diffstat (limited to 'net/samba')
| -rw-r--r-- | net/samba/Makefile | 4 | ||||
| -rw-r--r-- | net/samba/distinfo | 4 | ||||
| -rw-r--r-- | net/samba/patches/patch-client_client.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index ae73e5ce1ac..63bff750f82 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.211 2012/01/30 15:44:02 adam Exp $ +# $NetBSD: Makefile,v 1.212 2012/01/30 15:48:11 tron Exp $ .include "../../net/samba/Makefile.mirrors" DISTNAME= samba-${VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= net MASTER_SITES= ${SAMBA_MIRRORS:=stable/} diff --git a/net/samba/distinfo b/net/samba/distinfo index 671c023a16c..67f1d820900 100644 --- a/net/samba/distinfo +++ b/net/samba/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.81 2012/01/30 13:44:06 tron Exp $ +$NetBSD: distinfo,v 1.82 2012/01/30 15:48:11 tron Exp $ SHA1 (samba-3.6.3.tar.gz) = 430a1e13fe20c17e2808035c863eb5e77685c89b RMD160 (samba-3.6.3.tar.gz) = fd04fd5897f0f34f257c504de911e1ab34ff3e25 @@ -30,4 +30,4 @@ SHA1 (patch-bc) = 857e2400c8852f3c878f8d82857e80f214be2aea SHA1 (patch-bd) = b78324305bbf67fa4a7dd627e0af1618d2bf7b47 SHA1 (patch-be) = 2b298e596f2f57a595b83619ba68f6ad95febaaa SHA1 (patch-bf) = 9511567bfe9b579ae0a1c85483e7fe3ad4866973 -SHA1 (patch-client_client.c) = e65d4c17d77f61aa1f3f30b19d500756f6287fd8 +SHA1 (patch-client_client.c) = c25841ce89721c0d47e2e4f880949b8a158030c6 diff --git a/net/samba/patches/patch-client_client.c b/net/samba/patches/patch-client_client.c index d86dd932a19..2192b392ad2 100644 --- a/net/samba/patches/patch-client_client.c +++ b/net/samba/patches/patch-client_client.c @@ -1,4 +1,4 @@ -$NetBSD: patch-client_client.c,v 1.1 2012/01/30 13:44:06 tron Exp $ +$NetBSD: patch-client_client.c,v 1.2 2012/01/30 15:48:11 tron Exp $ Restore compatibility with CIFS server on Apple Time Capsule: @@ -12,7 +12,7 @@ https://bugzilla.samba.org/show_bug.cgi?id=8139 - if (!NT_STATUS_IS_OK(status)) { + if (!NT_STATUS_IS_OK(status) -+ && NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) { ++ && NT_STATUS_V(status) != 0xffff0002) { DEBUG(0, ("SMBecho failed. Maybe server has closed " "the connection\n")); finished = true; |