[pkgsrc/trunk]: pkgsrc/net/ethereal fix false complaints about SASL authentic...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cb2a932eb5b3
branches:  trunk
changeset: 498097:cb2a932eb5b3
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Aug 12 17:38:40 2005 +0000

description:
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:

 net/ethereal/Makefile         |   3 ++-
 net/ethereal/distinfo         |   3 ++-
 net/ethereal/patches/patch-ac |  22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diffs (51 lines):

diff -r fa2bc556f5b4 -r cb2a932eb5b3 net/ethereal/Makefile
--- a/net/ethereal/Makefile     Fri Aug 12 16:15:03 2005 +0000
+++ b/net/ethereal/Makefile     Fri Aug 12 17:38:40 2005 +0000
@@ -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 -r fa2bc556f5b4 -r cb2a932eb5b3 net/ethereal/distinfo
--- a/net/ethereal/distinfo     Fri Aug 12 16:15:03 2005 +0000
+++ b/net/ethereal/distinfo     Fri Aug 12 17:38:40 2005 +0000
@@ -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 -r fa2bc556f5b4 -r cb2a932eb5b3 net/ethereal/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/ethereal/patches/patch-ac     Fri Aug 12 17:38:40 2005 +0000
@@ -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;
+     }
+   }
+ }