backport request for patch 787683

[Peter Sylvester]

Someone mind to backport this to 2.2.x ?

thanks
/P

*787683* <http://svn.apache.org/viewvc?view=rev&revision=787683>

--- httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c     2009/05/27 05:41:07     
779005
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c     2009/06/23 14:10:06     
787683
@@ -428,10 +428,8 @@
    { "G",     NID_givenName,              1 },
    { "S",     NID_surname,                1 },
    { "D",     NID_description,            1 },
-#ifdef NID_x500UniqueIdentifier /* new name as of Openssl 0.9.7 */
-    { "UID",   NID_x500UniqueIdentifier,   1 },
-#else /* old name, OpenSSL < 0.9.7 */
-    { "UID",   NID_uniqueIdentifier,       1 },
+#ifdef NID_userId
+    { "UID",   NID_userId,                 1 },
#endif
    { "Email", NID_pkcs9_emailAddress,     1 },
    { NULL,    0                          }