commit 2ba6542517fcff4ec4e7051870085cfdb6bc26aa Merge: 90701c1 61dcd92 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jul 16 15:38:08 2015 -0400 Merge remote-tracking branch 'sysrqb/bug15220_026_sysrqb' changes/feature15220 | 5 +++ doc/tor.1.txt | 16 ++++++++- src/or/config.c | 92 +++++++++++++++++++++++++++++++++++++------------- src/or/connection.c | 46 +++++++++++++------------ src/or/or.h | 3 ++ 5 files changed, 116 insertions(+), 46 deletions(-) diff --cc src/or/config.c index 2f65664,9c02f0c..e686f61 --- a/src/or/config.c +++ b/src/or/config.c @@@ -556,9 -545,12 +556,10 @@@ static char *get_bindaddr_from_transpor static int parse_dir_authority_line(const char *line, dirinfo_type_t required_type, int validate_only); -static int parse_dir_fallback_line(const char *line, - int validate_only); static void port_cfg_free(port_cfg_t *port); static int parse_ports(or_options_t *options, int validate_only, - char **msg_out, int *n_ports_out); + char **msg_out, int *n_ports_out, + int *world_writable_control_socket); static int check_server_ports(const smartlist_t *ports, const or_options_t *options); @@@ -2662,6 -2587,10 +2663,7 @@@ options_validate(or_options_t *old_opti config_line_t *cl; const char *uname = get_uname(); int n_ports=0; - int world_writable_control_socket; -#define REJECT(arg) \ - STMT_BEGIN *msg = tor_strdup(arg); return -1; STMT_END -#define COMPLAIN(arg) STMT_BEGIN log_warn(LD_CONFIG, arg); STMT_END ++ int world_writable_control_socket=0; tor_assert(msg); *msg = NULL;