From a4e1014f4dbf8f763c5670772b1a59301f10bf00 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Sun, 11 Dec 2005 08:59:02 +0000 Subject: i think fascistfirewall still has its uses. it's a synonym for a certain reachableaddresses line, but it's easier to remember and people already understand it. i think we should think about undeprecating it. svn:r5559 --- src/or/config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 97903bcc95..64e29d39fc 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1914,14 +1914,14 @@ options_validate(or_options_t *old_options, or_options_t *options) }); new_line->value = smartlist_join_strings(instead,",",0,NULL); /* These have been deprecated since 0.1.1.5-alpha-cvs */ - log(LOG_WARN, LD_CONFIG, "FascistFirewall and FirewallPorts are deprecated. Instead, use \"ReachableAddresses %s\"", new_line->value); + log(LOG_NOTICE, LD_CONFIG, "Converting FascistFirewall and FirewallPorts config options to new format: \"ReachableAddresses %s\"", new_line->value); new_line->next = options->ReachableAddresses; options->ReachableAddresses = new_line; SMARTLIST_FOREACH(instead, char *, cp, tor_free(cp)); smartlist_free(instead); } - if (options->FascistFirewall || options->ReachableAddresses) { + if (options->ReachableAddresses) { /* We need to end with a reject *:*, not an implicit accept *:* */ config_line_t **linep = &options->ReachableAddresses; while (*linep) { -- cgit v1.2.3-54-g00ecf