[Pkg-openldap-devel] [openldap] 01/02: Import ITS#8240 patch

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch master
in repository openldap.

commit 392c1f4d4217723fdcd707f37beffc4a0b30ceb7
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Thu Sep 10 23:27:52 2015 +0000

    Import ITS#8240 patch
---
 debian/changelog                                   |  3 +++
 .../patches/ITS8240-remove-obsolete-assert.patch   | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2162ac0..3c2e004 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,9 @@ openldap (2.4.42+dfsg-2) UNRELEASED; urgency=medium
     It's already covered by the fallback case below.
   * Copy more comments from the slapd.conf template to slapd.init.ldif. Also 
     comment the shadowLastChange access rule.
+  * Import upstream patch to remove an unnecessary assert(0) that could be 
+    triggered remotely by an unauthenticated user by sending a malformed BER 
+    element. (ITS#8240)
 
   [ Peter Marschall ]
   * Add a manual page slapo-smbk5pwd.5 and update smbk5pwd's Makefile to 
diff --git a/debian/patches/ITS8240-remove-obsolete-assert.patch b/debian/patches/ITS8240-remove-obsolete-assert.patch
new file mode 100644
index 0000000..97bf6d7
--- /dev/null
+++ b/debian/patches/ITS8240-remove-obsolete-assert.patch
@@ -0,0 +1,25 @@
+From 6fe51a9ab04fd28bbc171da3cf12f1c1040d6629 Mon Sep 17 00:00:00 2001
+From: Howard Chu <hyc at openldap.org>
+Date: Thu, 10 Sep 2015 00:37:32 +0100
+Subject: [PATCH] ITS#8240 remove obsolete assert
+
+---
+ libraries/liblber/io.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
+index 85c3e23..c05dcf8 100644
+--- a/libraries/liblber/io.c
++++ b/libraries/liblber/io.c
+@@ -679,7 +679,7 @@ done:
+ 		return (ber->ber_tag);
+ 	}
+ 
+-	assert( 0 ); /* ber structure is messed up ?*/
++	/* invalid input */
+ 	return LBER_DEFAULT;
+ }
+ 
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index e39010c..0a2027e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.diff
 no-bdb-ABI-second-guessing
 heimdal-fix
 ITS6035-olcauthzregex-needs-restart.patch
+ITS8240-remove-obsolete-assert.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git