summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-06-20 15:28:06 -0400
committerNick Mathewson <nickm@torproject.org>2011-06-20 15:28:06 -0400
commit1040ccafb20d5d32cdf0945226f570dcbaf96e90 (patch)
tree002ccf617a2616756f37ee68fe04434efa6ee246
parent8e5dfe42a0230722bff07ba6ededcc0d2dbd53e7 (diff)
downloadtor-1040ccafb20d5d32cdf0945226f570dcbaf96e90.tar.gz
tor-1040ccafb20d5d32cdf0945226f570dcbaf96e90.zip
Fix overwide lines in util.c
-rw-r--r--src/common/util.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/common/util.c b/src/common/util.c
index 36aa9ccef8..b47b9c5fa2 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1677,11 +1677,12 @@ file_status(const char *fname)
* is group-readable, but in all cases we create the directory mode 0700.
* If CPD_CHECK_MODE_ONLY is set, then we don't alter the directory permissions
* if they are too permissive: we just return -1.
- * When effective_user is not NULL, check permissions against the given user and
- * its primary group.
+ * When effective_user is not NULL, check permissions against the given user
+ * and its primary group.
*/
int
-check_private_dir(const char *dirname, cpd_check_t check, const char *effective_user)
+check_private_dir(const char *dirname, cpd_check_t check,
+ const char *effective_user)
{
int r;
struct stat st;
@@ -1730,10 +1731,12 @@ check_private_dir(const char *dirname, cpd_check_t check, const char *effective_
}
#ifndef MS_WINDOWS
if (effective_user) {
- /* Lookup the user and group information, if we have a problem, bail out. */
+ /* Look up the user and group information.
+ * If we have a problem, bail out. */
pw = getpwnam(effective_user);
if (pw == NULL) {
- log_warn(LD_CONFIG, "Error setting configured user: %s not found", effective_user);
+ log_warn(LD_CONFIG, "Error setting configured user: %s not found",
+ effective_user);
return -1;
}
running_uid = pw->pw_uid;