summaryrefslogtreecommitdiffstatsabout
path: root/src/gnutls_config.c
diff options
context:
space:
mode:
authorPaul Querna <chip@outoforder.cc>2005-04-24 22:21:50 (GMT)
committer Paul Querna <chip@outoforder.cc>2005-04-24 22:21:50 (GMT)
commitc301152dbbdf13c4bf212c7982b948c21149468d (patch)
tree311447345aca9ee56f930428843aef6a7e48569d /src/gnutls_config.c
parent46b85d8e3634f34c0142823d92b037dd33b67898 (diff)
- move hooks to gnutls_hooks.c
- use 'mgs_' as the prefix for all symbols, instead of mixed prefixes.
Diffstat (limited to 'src/gnutls_config.c')
-rw-r--r--src/gnutls_config.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/gnutls_config.c b/src/gnutls_config.c
index 2c29ccb..f9a315c 100644
--- a/src/gnutls_config.c
+++ b/src/gnutls_config.c
@@ -59,8 +59,8 @@ const char *mgs_set_cert_file(cmd_parms * parms, void *dummy,
59 gnutls_datum_t data; 59 gnutls_datum_t data;
60 const char* file; 60 const char* file;
61 apr_pool_t* spool; 61 apr_pool_t* spool;
62 mod_gnutls_srvconf_rec *sc = 62 mgs_srvconf_rec *sc =
63 (mod_gnutls_srvconf_rec *) ap_get_module_config(parms->server-> 63 (mgs_srvconf_rec *) ap_get_module_config(parms->server->
64 module_config, 64 module_config,
65 &gnutls_module); 65 &gnutls_module);
66 apr_pool_create(&spool, parms->pool); 66 apr_pool_create(&spool, parms->pool);
@@ -91,8 +91,8 @@ const char *mgs_set_key_file(cmd_parms * parms, void *dummy,
91 gnutls_datum_t data; 91 gnutls_datum_t data;
92 const char* file; 92 const char* file;
93 apr_pool_t* spool; 93 apr_pool_t* spool;
94 mod_gnutls_srvconf_rec *sc = 94 mgs_srvconf_rec *sc =
95 (mod_gnutls_srvconf_rec *) ap_get_module_config(parms->server-> 95 (mgs_srvconf_rec *) ap_get_module_config(parms->server->
96 module_config, 96 module_config,
97 &gnutls_module); 97 &gnutls_module);
98 apr_pool_create(&spool, parms->pool); 98 apr_pool_create(&spool, parms->pool);
@@ -119,7 +119,7 @@ const char *mgs_set_cache(cmd_parms * parms, void *dummy,
119 const char *type, const char* arg) 119 const char *type, const char* arg)
120{ 120{
121 const char* err; 121 const char* err;
122 mod_gnutls_srvconf_rec *sc = ap_get_module_config(parms->server-> 122 mgs_srvconf_rec *sc = ap_get_module_config(parms->server->
123 module_config, 123 module_config,
124 &gnutls_module); 124 &gnutls_module);
125 if ((err = ap_check_cmd_context(parms, GLOBAL_ONLY))) { 125 if ((err = ap_check_cmd_context(parms, GLOBAL_ONLY))) {
@@ -127,21 +127,21 @@ const char *mgs_set_cache(cmd_parms * parms, void *dummy,
127 } 127 }
128 128
129 if (strcasecmp("none", type) == 0) { 129 if (strcasecmp("none", type) == 0) {
130 sc->cache_type = mod_gnutls_cache_none; 130 sc->cache_type = mgs_cache_none;
131 } 131 }
132 else if (strcasecmp("dbm", type) == 0) { 132 else if (strcasecmp("dbm", type) == 0) {
133 sc->cache_type = mod_gnutls_cache_dbm; 133 sc->cache_type = mgs_cache_dbm;
134 } 134 }
135#if HAVE_APR_MEMCACHE 135#if HAVE_APR_MEMCACHE
136 else if (strcasecmp("memcache", type) == 0) { 136 else if (strcasecmp("memcache", type) == 0) {
137 sc->cache_type = mod_gnutls_cache_memcache; 137 sc->cache_type = mgs_cache_memcache;
138 } 138 }
139#endif 139#endif
140 else { 140 else {
141 return "Invalid Type for GnuTLSCache!"; 141 return "Invalid Type for GnuTLSCache!";
142 } 142 }
143 143
144 if (sc->cache_type == mod_gnutls_cache_dbm) { 144 if (sc->cache_type == mgs_cache_dbm) {
145 sc->cache_config = ap_server_root_relative(parms->pool, arg); 145 sc->cache_config = ap_server_root_relative(parms->pool, arg);
146 } 146 }
147 else { 147 else {
@@ -155,8 +155,8 @@ const char *mgs_set_cache_timeout(cmd_parms * parms, void *dummy,
155 const char *arg) 155 const char *arg)
156{ 156{
157 int argint; 157 int argint;
158 mod_gnutls_srvconf_rec *sc = 158 mgs_srvconf_rec *sc =
159 (mod_gnutls_srvconf_rec *) ap_get_module_config(parms->server-> 159 (mgs_srvconf_rec *) ap_get_module_config(parms->server->
160 module_config, 160 module_config,
161 &gnutls_module); 161 &gnutls_module);
162 162
@@ -195,12 +195,12 @@ const char *mgs_set_client_verify(cmd_parms * parms, void *dummy,
195 195
196 /* This was set from a directory context */ 196 /* This was set from a directory context */
197 if (parms->path) { 197 if (parms->path) {
198 mod_gnutls_dirconf_rec *dc = (mod_gnutls_dirconf_rec *)dummy; 198 mgs_dirconf_rec *dc = (mgs_dirconf_rec *)dummy;
199 dc->client_verify_mode = mode; 199 dc->client_verify_mode = mode;
200 } 200 }
201 else { 201 else {
202 mod_gnutls_srvconf_rec *sc = 202 mgs_srvconf_rec *sc =
203 (mod_gnutls_srvconf_rec *) ap_get_module_config(parms->server-> 203 (mgs_srvconf_rec *) ap_get_module_config(parms->server->
204 module_config, 204 module_config,
205 &gnutls_module); 205 &gnutls_module);
206 sc->client_verify_mode = mode; 206 sc->client_verify_mode = mode;
@@ -214,8 +214,8 @@ const char *mgs_set_client_ca_file(cmd_parms * parms, void *dummy,
214{ 214{
215 int rv; 215 int rv;
216 const char* file; 216 const char* file;
217 mod_gnutls_srvconf_rec *sc = 217 mgs_srvconf_rec *sc =
218 (mod_gnutls_srvconf_rec *) ap_get_module_config(parms->server-> 218 (mgs_srvconf_rec *) ap_get_module_config(parms->server->
219 module_config, 219 module_config,
220 &gnutls_module); 220 &gnutls_module);
221 file = ap_server_root_relative(parms->pool, arg); 221 file = ap_server_root_relative(parms->pool, arg);
@@ -233,8 +233,8 @@ const char *mgs_set_client_ca_file(cmd_parms * parms, void *dummy,
233const char *mgs_set_enabled(cmd_parms * parms, void *dummy, 233const char *mgs_set_enabled(cmd_parms * parms, void *dummy,
234 const char *arg) 234 const char *arg)
235{ 235{
236 mod_gnutls_srvconf_rec *sc = 236 mgs_srvconf_rec *sc =
237 (mod_gnutls_srvconf_rec *) ap_get_module_config(parms->server-> 237 (mgs_srvconf_rec *) ap_get_module_config(parms->server->
238 module_config, 238 module_config,
239 &gnutls_module); 239 &gnutls_module);
240 if (!strcasecmp(arg, "On")) { 240 if (!strcasecmp(arg, "On")) {
@@ -253,7 +253,7 @@ const char *mgs_set_enabled(cmd_parms * parms, void *dummy,
253void *mgs_config_server_create(apr_pool_t * p, server_rec * s) 253void *mgs_config_server_create(apr_pool_t * p, server_rec * s)
254{ 254{
255 int i; 255 int i;
256 mod_gnutls_srvconf_rec *sc = apr_pcalloc(p, sizeof(*sc)); 256 mgs_srvconf_rec *sc = apr_pcalloc(p, sizeof(*sc));
257 257
258 sc->enabled = GNUTLS_ENABLED_FALSE; 258 sc->enabled = GNUTLS_ENABLED_FALSE;
259 259
@@ -261,7 +261,7 @@ void *mgs_config_server_create(apr_pool_t * p, server_rec * s)
261 sc->privkey_x509 = NULL; 261 sc->privkey_x509 = NULL;
262 sc->cert_x509 = NULL; 262 sc->cert_x509 = NULL;
263 sc->cache_timeout = apr_time_from_sec(300); 263 sc->cache_timeout = apr_time_from_sec(300);
264 sc->cache_type = mod_gnutls_cache_dbm; 264 sc->cache_type = mgs_cache_dbm;
265 sc->cache_config = ap_server_root_relative(p, "conf/gnutls_cache"); 265 sc->cache_config = ap_server_root_relative(p, "conf/gnutls_cache");
266 266
267 /* TODO: Make this Configurable. But it isn't configurable in mod_ssl? */ 267 /* TODO: Make this Configurable. But it isn't configurable in mod_ssl? */
@@ -319,7 +319,7 @@ void *mgs_config_server_create(apr_pool_t * p, server_rec * s)
319 319
320void *mgs_config_dir_create(apr_pool_t *p, char *dir) 320void *mgs_config_dir_create(apr_pool_t *p, char *dir)
321{ 321{
322 mod_gnutls_dirconf_rec *dc = apr_palloc(p, sizeof(*dc)); 322 mgs_dirconf_rec *dc = apr_palloc(p, sizeof(*dc));
323 323
324 dc->client_verify_mode = -1; 324 dc->client_verify_mode = -1;
325 325