X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=loadcfg.c;h=d7401521b394c9a3499d6daa9fa3077718db5e3b;hb=1d3617ad81eb29fadd92bc7e98a74a7b7c8212d3;hp=31463db17ff1d696945a2405b537032ccb4dc373;hpb=767afb7f5d7062d75385b9ab3afdad47d0249a39;p=privoxy.git diff --git a/loadcfg.c b/loadcfg.c index 31463db1..d7401521 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -278,7 +278,7 @@ static void unload_configfile (void * data) freez(config->usermanual); freez(config->trusted_cgi_referrer); -#ifdef FEATURE_HTTPS_FILTERING +#ifdef FEATURE_HTTPS_INSPECTION freez(config->ca_password); freez(config->ca_directory); freez(config->ca_cert_file); @@ -584,7 +584,7 @@ struct configuration_spec * load_config(void) unsigned long linenum = 0; int i; char *logfile = NULL; -#ifdef FEATURE_HTTPS_FILTERING +#ifdef FEATURE_HTTPS_INSPECTION char *ca_cert_file = NULL; char *ca_key_file = NULL; char *ca_directory = NULL; @@ -635,7 +635,7 @@ struct configuration_spec * load_config(void) config->usermanual = strdup_or_die(USER_MANUAL_URL); config->proxy_args = strdup_or_die(""); config->forwarded_connect_retries = 0; -#ifdef FEATURE_HTTPS_FILTERING +#ifdef FEATURE_HTTPS_INSPECTION config->ca_password = strdup(""); ca_cert_file = strdup("cacert.crt"); ca_key_file = strdup("cakey.pem"); @@ -1733,7 +1733,7 @@ struct configuration_spec * load_config(void) config->usermanual = strdup_or_die(arg); break; -#ifdef FEATURE_HTTPS_FILTERING +#ifdef FEATURE_HTTPS_INSPECTION /* ************************************************************************* * ca private key file password * *************************************************************************/ @@ -1986,7 +1986,7 @@ struct configuration_spec * load_config(void) } } -#ifdef FEATURE_HTTPS_FILTERING +#ifdef FEATURE_HTTPS_INSPECTION /* * Setting SSL parameters from loaded values into structures */