From: Nick Kew <niq@apache.org>
Date: Tue, 9 Sep 2008 00:52:03 +0000 (+0000)
Subject: mod_authnz_ldap: avoid returning NULL env vars
X-Git-Tag: 2.3.0~313
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e8dd90b487fafca0365f9a63d500f2d234f6bb04;p=apache

mod_authnz_ldap: avoid returning NULL env vars
PR 39045


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@693328 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 9664c26111..46935c276a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) mod_authnz_ldap: don't return NULL-valued environment variables to
+     other modules.  PR 39045 [Francois Pesce <francois.pesce gmail.com>]
+
   *) Don't adjust case in pathname components that are not of interest
      to mod_mime.  Fixes mod_negotiation's use of such components.
      PR 43250 [Basant Kumar Kukreja <basant.kukreja sun.com>]
diff --git a/modules/aaa/mod_authnz_ldap.c b/modules/aaa/mod_authnz_ldap.c
index d617f5bca6..25229bb0cf 100644
--- a/modules/aaa/mod_authnz_ldap.c
+++ b/modules/aaa/mod_authnz_ldap.c
@@ -446,7 +446,7 @@ start_over:
                 str[j] = apr_toupper(str[j]);
                 j++;
             }
-            apr_table_setn(e, str, vals[i]);
+            apr_table_setn(e, str, vals[i] ? vals[i] : "");
 
             /* handle remote_user_attribute, if set */
             if (sec->remote_user_attribute &&