use ssl_cmd_verify_parse for SSLProxyVerify directive handler

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

diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index 9c5af5cd639b1029b8fab0756d7a901fd3360458..3b9138752f86bcca59bf3e9b418c334eb3427594 100644 (file)
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -160,7 +160,7 @@ static const command_rec ssl_config_cmds[] = {
     SSL_CMD_SRV(ProxyCipherSuite, TAKE1,
                "SSL Proxy: colon-delimited list of permitted SSL ciphers "
                "(`XXX:...:XXX' - see manual)")
-    SSL_CMD_SRV(ProxyVerify, FLAG,
+    SSL_CMD_SRV(ProxyVerify, TAKE1,
                "SSL Proxy: whether to verify the remote certificate "
                "(`on' or `off')")
     SSL_CMD_SRV(ProxyVerifyDepth, TAKE1,

diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h
index a5182d70b3d34125f97894305852fb35af47fc46..619bc499a812e4950b71e8015031b7040cecab36 100644 (file)
--- a/modules/ssl/mod_ssl.h
+++ b/modules/ssl/mod_ssl.h
@@ -590,7 +590,7 @@ const char  *ssl_cmd_SSLRequire(cmd_parms *, void *, const char *);
 
 const char  *ssl_cmd_SSLProxyProtocol(cmd_parms *, void *, const char *);
 const char  *ssl_cmd_SSLProxyCipherSuite(cmd_parms *, void *, const char *);
-const char  *ssl_cmd_SSLProxyVerify(cmd_parms *, void *, int);
+const char  *ssl_cmd_SSLProxyVerify(cmd_parms *, void *, const char *);
 const char  *ssl_cmd_SSLProxyVerifyDepth(cmd_parms *, void *, const char *);
 const char  *ssl_cmd_SSLProxyCACertificatePath(cmd_parms *, void *, const char *);
 const char  *ssl_cmd_SSLProxyCACertificateFile(cmd_parms *, void *, const char *);

diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index a93e5f28750e355d25b646c8360ecb11505126e3..9c18e208dd17adf1052845bc1fe4c5651c392f66 100644 (file)
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -857,18 +857,18 @@ const char *ssl_cmd_SSLVerifyClient(cmd_parms *cmd,
 {
     SSLDirConfigRec *dc = (SSLDirConfigRec *)dcfg;
     SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
-    ssl_verify_t id;
+    ssl_verify_t mode;
     const char *err;
 
-    if ((err = ssl_cmd_verify_parse(cmd, arg, &id))) {
+    if ((err = ssl_cmd_verify_parse(cmd, arg, &mode))) {
         return err;
     }
     
     if (cmd->path) {
-        dc->nVerifyClient = id;
+        dc->nVerifyClient = mode;
     }
     else {
-        sc->server->auth.verify_mode = id;
+        sc->server->auth.verify_mode = mode;
     }
 
     return NULL;
@@ -1279,11 +1279,17 @@ const char *ssl_cmd_SSLProxyCipherSuite(cmd_parms *cmd,
 
 const char *ssl_cmd_SSLProxyVerify(cmd_parms *cmd,
                                    void *dcfg,
-                                   int flag)
+                                   const char *arg)
 {
     SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
+    ssl_verify_t mode;
+    const char *err;
+
+    if ((err = ssl_cmd_verify_parse(cmd, arg, &id))) {
+        return err;
+    }
 
-    sc->proxy->auth.verify_mode = flag ? TRUE : FALSE;
+    sc->proxy->auth.verify_mode = mode;
 
     return NULL;
 }