Changeset 176047e in mod_gnutls for src/gnutls_config.c

Timestamp:

Sep 17, 2015, 4:25:07 PM (7 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, upstream

Children:

88df24d

Parents:

7764015

Message:

Use AP_INIT_FLAG for On/Off? config directives

Letting the Apache config parser handle the parameter and just pass a
boolean to the module's handler simplifies the handler functions
significantly.

File:

• src/gnutls_config.c (modified) (2 diffs)

src/gnutls_config.c

@@ -642 +642 @@
 }
 
-const char *mgs_set_tickets(cmd_parms * parms, void *dummy __attribute__((unused)),
-        const char *arg) {
-    mgs_srvconf_rec *sc =
-        (mgs_srvconf_rec *) ap_get_module_config(parms->server->
-                                                 module_config,
-                                                 &gnutls_module);
-
-    sc->tickets = 0;
-    if (strcasecmp("on", arg) == 0) {
-        sc->tickets = 1;
-    }
+const char *mgs_set_tickets(cmd_parms *parms,
+                            void *dummy __attribute__((unused)),
+                            const int arg)
+{
+    mgs_srvconf_rec *sc = (mgs_srvconf_rec *)
+        ap_get_module_config(parms->server->module_config, &gnutls_module);
+
+    if (arg)
+        sc->tickets = GNUTLS_ENABLED_TRUE;
+    else
+        sc->tickets = GNUTLS_ENABLED_FALSE;
 
     return NULL;
@@ -826 +826 @@
 }
 
-const char *mgs_set_proxy_engine(cmd_parms * parms, void *dummy __attribute__((unused)),
-        const char *arg) {
-
+/*
+ * Enable TLS proxy operation if arg is true, disable it otherwise.
+ */
+const char *mgs_set_proxy_engine(cmd_parms *parms,
+                                 void *dummy __attribute__((unused)),
+                                 const int arg)
+{
     mgs_srvconf_rec *sc = (mgs_srvconf_rec *)
-        ap_get_module_config(parms->server->module_config, &gnutls_module);
-
-    if (!strcasecmp(arg, "On")) {
-        sc->proxy_enabled = GNUTLS_ENABLED_TRUE;
-    } else if (!strcasecmp(arg, "Off")) {
-        sc->proxy_enabled = GNUTLS_ENABLED_FALSE;
-    } else {
-        return "GnuTLSProxyEngine must be set to 'On' or 'Off'";
-    }
-
-    return NULL;
-}
-
-const char *mgs_set_enabled(cmd_parms * parms, void *dummy __attribute__((unused)),
-        const char *arg) {
-    mgs_srvconf_rec *sc =
-        (mgs_srvconf_rec *) ap_get_module_config(parms->server->
-                                                 module_config,
-                                                 &gnutls_module);
-    if (!strcasecmp(arg, "On")) {
-        sc->enabled = GNUTLS_ENABLED_TRUE;
-    } else if (!strcasecmp(arg, "Off")) {
-        sc->enabled = GNUTLS_ENABLED_FALSE;
-    } else {
-        return "GnuTLSEnable must be set to 'On' or 'Off'";
-    }
+        ap_get_module_config(parms->server->module_config, &gnutls_module);
+
+    if (arg)
+        sc->proxy_enabled = GNUTLS_ENABLED_TRUE;
+    else
+        sc->proxy_enabled = GNUTLS_ENABLED_FALSE;
+
+    return NULL;
+}
+
+/*
+ * Enable TLS for the server/vhost if arg is true, disable it
+ * otherwise.
+ */
+const char *mgs_set_enabled(cmd_parms *parms,
+                            void *dummy __attribute__((unused)),
+                            const int arg)
+{
+    mgs_srvconf_rec *sc = (mgs_srvconf_rec *)
+        ap_get_module_config(parms->server->module_config, &gnutls_module);
+
+    if (arg)
+        sc->enabled = GNUTLS_ENABLED_TRUE;
+    else
+        sc->enabled = GNUTLS_ENABLED_FALSE;
 
     return NULL;