From: Graham Leggett <minfrin@apache.org>
Date: Sun, 6 Sep 2009 11:19:05 +0000 (+0000)
Subject: mod_ssl: Fix SSL_*_DN_UID variables to use the 'userID' attribute type.
X-Git-Tag: 2.2.14~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24a53b7a2ca762321a4f3f333ee3d48fedd8a8b6;p=thirdparty%2Fapache%2Fhttpd.git

mod_ssl: Fix SSL_*_DN_UID variables to use the 'userID' attribute type.
PR 45107.  [Michael Ströder <michael stroeder.com>,
Peter Sylvester <peter.sylvester edelweb.fr>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@811812 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 94ecd7fab98..4e0d9c7de4d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.14
 
+  *) mod_ssl: Fix SSL_*_DN_UID variables to use the 'userID' attribute
+     type.  PR 45107.  [Michael Ströder <michael stroeder.com>,
+     Peter Sylvester <peter.sylvester edelweb.fr>]
+
   *) mod_cache: Add CacheIgnoreURLSessionIdentifiers directive to ignore
      defined session identifiers encoded in the URL when caching.
      [Ruediger Pluem]
diff --git a/STATUS b/STATUS
index 35d35735d4e..061b5aa9b6c 100644
--- a/STATUS
+++ b/STATUS
@@ -108,12 +108,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    -0: wrowe; Please refer to man 'access' BUGS section about linux 2.4 
               vs 2.6 kernels, potentially a suspect test for root.
 
- * mod_ssl: Map the _UID variable to NID_userId, where defined by OpenSSL.
-            (PR: 45107)
-   Trunk Patch: http://svn.apache.org/viewvc?view=rev&revision=787683
-   2.2.x Patch: http://people.apache.org/~fuankg/diffs/backport_r787683.diff
-   +1: fuankg, rpluem, minfrin
-
 PATCHES/ISSUES THAT ARE STALLED
 
   * srclib/pcre and vendor/pcre
diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
index 7833f14a6ee..ab99af9efb9 100644
--- a/modules/ssl/ssl_engine_vars.c
+++ b/modules/ssl/ssl_engine_vars.c
@@ -418,10 +418,8 @@ static const struct {
     { "G",     NID_givenName              },
     { "S",     NID_surname                },
     { "D",     NID_description            },
-#ifdef NID_x500UniqueIdentifier /* new name as of Openssl 0.9.7 */
-    { "UID",   NID_x500UniqueIdentifier   },
-#else /* old name, OpenSSL < 0.9.7 */
-    { "UID",   NID_uniqueIdentifier       },
+#ifdef NID_userId
+    { "UID",   NID_userId                 },
 #endif
     { "Email", NID_pkcs9_emailAddress     },
     { NULL,    0                          }