From: Doug MacEachern <dougm@apache.org>
Date: Fri, 29 Mar 2002 03:05:49 +0000 (+0000)
Subject: use ssl_cmd_verify_parse for SSLProxyVerify directive handler
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4254e2ecaa2def7a7803873b03d9e5d39ea249a;p=thirdparty%2Fapache%2Fhttpd.git

use ssl_cmd_verify_parse for SSLProxyVerify directive handler


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

diff --git a/mod_ssl.c b/mod_ssl.c
index 9c5af5cd639..3b9138752f8 100644
--- a/mod_ssl.c
+++ b/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/mod_ssl.h b/mod_ssl.h
index a5182d70b3d..619bc499a81 100644
--- a/mod_ssl.h
+++ b/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/ssl_engine_config.c b/ssl_engine_config.c
index a93e5f28750..9c18e208dd1 100644
--- a/ssl_engine_config.c
+++ b/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;
 }