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 9664c2611167d4e88db6c251c0768e2dba25eb85..46935c276ad4c08177ee6f3f2f7fdec43335913c 100644 (file)
--- 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 d617f5bca654bafeb6c2780cbe04ac2c79a44ac2..25229bb0cf872b594b6ff5e69aaeba570398ff2a 100644 (file)
--- 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 &&