summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authordrochner <drochner>2005-08-12 17:38:40 +0000
committerdrochner <drochner>2005-08-12 17:38:40 +0000
commit8ff6ad1a1673ceb4952cf8f76199a6e0f038154a (patch)
tree4fb8b95c11f9878b5bc3f47f8d0bc9f7dc1d2544 /net
parent15a01cfe81b904b483e8dccc3e58c06d1bbcb06a (diff)
downloadpkgsrc-8ff6ad1a1673ceb4952cf8f76199a6e0f038154a.tar.gz
fix false complaints about SASL authenticated LDAP bind replies:
according to rfc2251 the credentials are indeed "context specific" (in terms of ASN.1) bump PKGREVISION
Diffstat (limited to 'net')
-rw-r--r--net/ethereal/Makefile3
-rw-r--r--net/ethereal/distinfo3
-rw-r--r--net/ethereal/patches/patch-ac22
3 files changed, 26 insertions, 2 deletions
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 1d58e2fa4cf..952861adeb0 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.114 2005/08/10 20:56:21 jlam Exp $
+# $NetBSD: Makefile,v 1.115 2005/08/12 17:38:40 drochner Exp $
DISTNAME= ethereal-0.10.12
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.ethereal.com/distribution/ \
http://ethereal.planetmirror.com/distribution/ \
diff --git a/net/ethereal/distinfo b/net/ethereal/distinfo
index 01ea297cd05..6ca1e7f7ac3 100644
--- a/net/ethereal/distinfo
+++ b/net/ethereal/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.40 2005/07/27 16:44:43 drochner Exp $
+$NetBSD: distinfo,v 1.41 2005/08/12 17:38:40 drochner Exp $
SHA1 (ethereal-0.10.12.tar.bz2) = d08ddf9135fd56ac0a2c0dc17436c4e0736590fe
RMD160 (ethereal-0.10.12.tar.bz2) = 4d974b372a040fb70fdcc264d84f84e77e58247f
Size (ethereal-0.10.12.tar.bz2) = 7749174 bytes
SHA1 (patch-aa) = 0513b971c0af032fc64fc181fbd64d78aef0d044
SHA1 (patch-ab) = 7f7302cfaf5d78d5ca8c89be45fcd57e9475463a
+SHA1 (patch-ac) = 2d6b0c2657a2bf432b78f18a3f2b20cecca7a7f6
diff --git a/net/ethereal/patches/patch-ac b/net/ethereal/patches/patch-ac
new file mode 100644
index 00000000000..61767cad993
--- /dev/null
+++ b/net/ethereal/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.3 2005/08/12 17:38:40 drochner Exp $
+
+--- epan/dissectors/packet-ldap.c.orig 2005-07-26 21:26:41.000000000 +0200
++++ epan/dissectors/packet-ldap.c
+@@ -1283,16 +1283,10 @@ static void dissect_ldap_response_bind(A
+ a->offset += cred_length;
+ } else {
+ if (read_bytestring(a, tree, hf_ldap_message_bind_server_credentials,
+- NULL, NULL, ASN1_UNI, ASN1_OTS) != ASN1_ERR_NOERROR)
++ NULL, NULL, ASN1_CTX, 7) != ASN1_ERR_NOERROR)
+ return;
+ }
+ break;
+-
+- default:
+- if (read_bytestring(a, tree, hf_ldap_message_bind_server_credentials,
+- NULL, NULL, ASN1_CTX, 7) != ASN1_ERR_NOERROR)
+- return;
+- break;
+ }
+ }
+ }