From: Kaspar Brand <kbrand@apache.org>
Date: Sun, 5 Jan 2014 07:58:54 +0000 (+0000)
Subject: make the ppcb_arg initialization a bit more uniform and easier to read
X-Git-Tag: 2.5.0-alpha~4669
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4c079f6ff3c275577b3aa3721aea0bc69eca32bc;p=apache

make the ppcb_arg initialization a bit more uniform and easier to read

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

diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c
index 64fdae7aff..d5546dd5e5 100644
--- a/modules/ssl/ssl_engine_pphrase.c
+++ b/modules/ssl/ssl_engine_pphrase.c
@@ -143,24 +143,10 @@ apr_status_t ssl_load_encrypted_pkey(server_rec *s, apr_pool_t *p, int idx,
     int nPassPhraseRetry = 0;
     apr_time_t pkey_mtime = 0;
     apr_status_t rv;
-    pphrase_cb_arg_t ppcb_arg = {
-        NULL,
-        NULL,
-        NULL,
-        0,
-        NULL,
-        0,
-        0,
-        TRUE,
-        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 *);
+    pphrase_cb_arg_t ppcb_arg;
+
+    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)
@@ -175,6 +161,16 @@ apr_status_t ssl_load_encrypted_pkey(server_rec *s, apr_pool_t *p, int idx,
          return ssl_die(s);
     }
 
+    ppcb_arg.s                     = s;
+    ppcb_arg.p                     = p;
+    ppcb_arg.aPassPhrase           = *pphrases;
+    ppcb_arg.nPassPhraseCur        = 0;
+    ppcb_arg.cpPassPhraseCur       = NULL;
+    ppcb_arg.nPassPhraseDialog     = 0;
+    ppcb_arg.nPassPhraseDialogCur  = 0;
+    ppcb_arg.bPassPhraseDialogOnce = TRUE;
+    ppcb_arg.key_id                = key_id;
+
     /*
      * if the private key is encrypted and SSLPassPhraseDialog
      * is configured to "builtin" it isn't possible to prompt for