Drop the check that NSSProxyNickname be required

This was incorrectly a required value when it is a completely
optional setting. Remove it from the check completely and add
a log entry when it is set.

https://bugzilla.redhat.com/show_bug.cgi?id=874847

1 files changed, 7 insertions, 10 deletions

diff --git a/nss_engine_init.c b/nss_engine_init.c
index b158439..4460f53 100644
--- a/nss_engine_init.c
+++ b/nss_engine_init.c
@@ -1281,9 +1281,8 @@ static void nss_init_server_certs(server_rec *s,
 #endif
         {
             /*
-             * Since this is a 'fatal' error, regardless of whether this
-             * particular invocation is from a 'server' object or a 'proxy'
-             * object, issue all error message(s) as appropriate.
+             * This is a 'fatal' error since a 'nickname' is required for
+             * a 'server' object; log error message(s) as appropriate.
              */
             if ((mctx->sc->enabled == TRUE) &&
                 (mctx->sc->server) &&
@@ -1292,13 +1291,6 @@ static void nss_init_server_certs(server_rec *s,
                     "NSSEngine on; no certificate nickname provided by NSSNickname.");
             }
 
-            if ((mctx->sc->proxy_enabled == TRUE) &&
-                (mctx->sc->proxy) &&
-                (mctx->sc->proxy->nickname == NULL)) {
-                ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
-                    "NSSProxyEngine on; no certificate nickname provided by NSSProxyNickname.");
-            }
-
             nss_die();
         }
 
@@ -1327,6 +1319,11 @@ static void nss_init_server_certs(server_rec *s,
             "SSL error configuring handshake callback: '%s'", mctx->nickname);
         nss_log_nss_error(APLOG_MARK, APLOG_ERR, s);
         nss_die();
+    } else {
+        if (!mctx->as_server && mctx->nickname != NULL) {
+            ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
+                "Configured proxy nickname as '%s'", mctx->nickname);
+        }
     }
 
 }