nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kill duplicated code in connection_listener_new()

Browse Source
This commit is contained in:
Andrea Shepard 2015-01-12 16:26:34 +00:00
parent 78956f5d85
commit 62f297fff0
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/or/connection.c
View File

@ -1234,18 +1234,10 @@ connection_listener_new(const struct sockaddr *listensockaddr,
} }
#endif #endif
if (type == CONN_TYPE_CONTROL_LISTENER && if ((type == CONN_TYPE_CONTROL_LISTENER &&
options->ControlSocketsGroupWritable) { options->ControlSocketsGroupWritable) ||
/* We need to use chmod; fchmod doesn't work on sockets on all (type == CONN_TYPE_AP_LISTENER &&
* platforms. */ options->SocksSocketsGroupWritable)) {
if (chmod(address, 0660) < 0) {
log_warn(LD_FS,"Unable to make %s group-writable.", address);
goto err;
}
}
if (type == CONN_TYPE_AP_LISTENER &&
options->SocksSocketsGroupWritable) {
/* We need to use chmod; fchmod doesn't work on sockets on all /* We need to use chmod; fchmod doesn't work on sockets on all
* platforms. */ * platforms. */
if (chmod(address, 0660) < 0) { if (chmod(address, 0660) < 0) {