Merge remote-tracking branch 'origin/maint-0.2.2'

1 files changed, 8 insertions, 5 deletions

diff --git a/src/common/util.c b/src/common/util.c
index 629c33977b..b95ee3a612 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1678,11 +1678,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;
@@ -1731,10 +1732,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;