torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove more redundant code from r17200

Browse Source 
svn:r17203
This commit is contained in:
Roger Dingledine
2008-11-07 04:11:03 +00:00
parent d27337bf17
commit 7c65792500
1 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/compat.c
+9 -19
View File
@@ -1016,7 +1016,7 @@ log_credential_status(void)
return 0;
}
/** Call setuid and setgid to run as <b>user</b> and only switch to their
/** Call setuid and setgid to run as <b>user</b> and switch to their
* primary group. Return 0 on success. On failure, log and return -1.
*/
int
@@ -1030,11 +1030,9 @@ switch_id(const char *user)
tor_assert(user);
/* Log the initial credential state */
if (user) {
if (log_credential_status()) {
return -1;
}
}
if (log_credential_status())
return -1;
log_fn(CREDENTIAL_LOG_LEVEL, LD_GENERAL, "Changing user and groups");
/* Get old UID/GID to check if we changed correctly */
@@ -1042,15 +1040,9 @@ switch_id(const char *user)
old_gid = getgid();
/* Lookup the user and group information, if we have a problem, bail out. */
if (user) {
pw = getpwnam(user);
if (pw == NULL) {
log_warn(LD_CONFIG, "Error setting configured user: %s not found", user);
return -1;
}
} else {
/* We have no user supplied and so we'll bail out. */
log_warn(LD_CONFIG, "Error setting configured user: No user supplied.");
pw = getpwnam(user);
if (pw == NULL) {
log_warn(LD_CONFIG, "Error setting configured user: %s not found", user);
return -1;
}
@@ -1121,10 +1113,8 @@ switch_id(const char *user)
#endif
/* Check what really happened */
if (user) {
if (log_credential_status()) {
return -1;
}
if (log_credential_status()) {
return -1;
}
return 0;