From: Guenter Knauf <fuankg@apache.org>
Date: Mon, 30 Dec 2013 11:31:37 +0000 (+0000)
Subject: CodeWarrior compiler doesnt allow vars as struct inits.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b52ca9670d66bc166ca4bb06aafb74264616a04;p=thirdparty%2Fapache%2Fhttpd.git

CodeWarrior compiler doesnt allow vars as struct inits.


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

diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c
index 4d06c4fe034..64fdae7aff9 100644
--- a/modules/ssl/ssl_engine_pphrase.c
+++ b/modules/ssl/ssl_engine_pphrase.c
@@ -144,18 +144,24 @@ apr_status_t ssl_load_encrypted_pkey(server_rec *s, apr_pool_t *p, int idx,
     apr_time_t pkey_mtime = 0;
     apr_status_t rv;
     pphrase_cb_arg_t ppcb_arg = {
-        s,
-        p,
-        *pphrases,
+        NULL,
+        NULL,
+        NULL,
         0,
         NULL,
         0,
         0,
         TRUE,
-        key_id,
-        APR_ARRAY_IDX(sc->server->pks->key_files, idx, const char *)
+        NULL,
+        NULL
     };
 
+    ppcb_arg.s = s;
+    ppcb_arg.p = p;
+    ppcb_arg.aPassPhrase = *pphrases;
+    ppcb_arg.key_id = key_id;
+    ppcb_arg.pkey_file = APR_ARRAY_IDX(sc->server->pks->key_files, idx, const char *);
+
     if (!ppcb_arg.pkey_file) {
          ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, APLOGNO(02573)
                       "Init: No private key specified for %s", key_id);