diff options
| -rw-r--r-- | src/common/compat.c | 5 | ||||
| -rw-r--r-- | src/or/config.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index ecbae6ab0b..e8b7ab54a7 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1026,9 +1026,13 @@ switch_id(const char *user) struct passwd *pw = NULL; uid_t old_uid; gid_t old_gid; + static int have_already_switched_id = 0; tor_assert(user); + if (have_already_switched_id) + return 0; + /* Log the initial credential state */ if (log_credential_status()) return -1; @@ -1117,6 +1121,7 @@ switch_id(const char *user) return -1; } + have_already_switched_id = 1; /* mark success so we never try again */ return 0; #else diff --git a/src/or/config.c b/src/or/config.c index 66ee6cd52b..397d77b7d9 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1084,8 +1084,6 @@ options_act_reversible(or_options_t *old_options, char **msg) /* Setuid/setgid as appropriate */ if (options->User) { - /* XXXX021 We should only do this the first time through, not on - * every setconf. */ if (switch_id(options->User) != 0) { /* No need to roll back, since you can't change the value. */ *msg = tor_strdup("Problem with User value. See logs for details."); |