commit b48f8a8114575793046a8e9d3544d6b2d0a17f82 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 15 09:21:29 2016 -0400

Fix whitespace. --- src/common/util.c | 6 ++++-- src/or/circuitbuild.c | 4 +++- src/or/config.c | 6 ++++-- src/or/main.c | 3 ++- src/or/rendcommon.c | 1 + src/or/rendcommon.h | 2 +- src/or/routerlist.c | 1 + 7 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/common/util.c b/src/common/util.c index 52b87f8..39d6502 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2074,7 +2074,8 @@ check_private_dir(const char *dirname, cpd_check_t check, * the file between stat() and chmod(), a potential race exists. * * Several suggestions taken from: - * https://developer.apple.com/library/mac/documentation/Security/Conceptual/Se... + * https://developer.apple.com/library/mac/documentation/ + * Security/Conceptual/SecureCodingGuide/Articles/RaceConditions.html */

/* Open directory. @@ -2985,7 +2986,8 @@ expand_filename(const char *filename) tor_assert(filename); #ifdef _WIN32 /* Might consider using GetFullPathName() as described here: - * http://etutorials.org/Programming/secure+programming/Chapter+3.+Input+Valida... + * http://etutorials.org/Programming/secure+programming/ + * Chapter+3.+Input+Validation/3.7+Validating+Filenames+and+Paths/ */ return tor_strdup(filename); #else diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index a15f4c2..237b61a 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2420,7 +2420,8 @@ build_state_get_exit_nickname(cpath_build_state_t *state) }

/** Return true iff the given address can be used to extend to. */ -int extend_info_addr_is_allowed(const tor_addr_t *addr) +int +extend_info_addr_is_allowed(const tor_addr_t *addr) { tor_assert(addr);

@@ -2434,3 +2435,4 @@ int extend_info_addr_is_allowed(const tor_addr_t *addr) disallow: return 0; } + diff --git a/src/or/config.c b/src/or/config.c index 8f3c28c..0e15f9b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6325,7 +6325,8 @@ parse_port_config(smartlist_t *out, ipv4_traffic = 1, ipv6_traffic = 0, prefer_ipv6 = 0, cache_ipv4 = 1, use_cached_ipv4 = 0, cache_ipv6 = 0, use_cached_ipv6 = 0, - prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0, relax_dirmode_check = 0, + prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0, + relax_dirmode_check = 0, has_used_unix_socket_only_option = 0;

smartlist_split_string(elts, ports->value, NULL, @@ -6577,7 +6578,8 @@ parse_port_config(smartlist_t *out,

if ( has_used_unix_socket_only_option && ! unix_socket_path) { log_warn(LD_CONFIG, "You have a %sPort entry with GroupWritable, " - "WorldWritable, or RelaxDirModeCheck, but it is not a unix socket.", portname); + "WorldWritable, or RelaxDirModeCheck, but it is not a " + "unix socket.", portname); goto err; }

diff --git a/src/or/main.c b/src/or/main.c index cfd1169..713816d 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -572,7 +572,8 @@ connection_check_event(connection_t *conn, struct event *ev) conn_type_to_string(conn->type), conn_state_to_string(conn->type, conn->state), (int)conn->s, (int)conn->linked, - (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request), + (conn->type == CONN_TYPE_AP && + TO_EDGE_CONN(conn)->is_dns_request), conn->marked_for_close_file ? conn->marked_for_close_file : "-", conn->marked_for_close ); diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 79509cb..603e4f0 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -1009,3 +1009,4 @@ MOCK_IMPL(int, hid_serv_responsible_for_desc_id, smartlist_free(responsible); return result; } + diff --git a/src/or/rendcommon.h b/src/or/rendcommon.h index fe45299..7d81976 100644 --- a/src/or/rendcommon.h +++ b/src/or/rendcommon.h @@ -58,7 +58,7 @@ void rend_get_descriptor_id_bytes(char *descriptor_id_out, const char *service_id, const char *secret_id_part); int hid_serv_get_responsible_directories(smartlist_t *responsible_dirs, - const char *id); + const char *id); int hid_serv_acting_as_directory(void); MOCK_DECL(int, hid_serv_responsible_for_desc_id, (const char *id));

diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 7f20aa9..bc5e2e9 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5395,3 +5395,4 @@ refresh_all_country_info(void)

nodelist_refresh_countries(); } +