From: Andre Noll <maan@tuebingen.mpg.de>
Date: Fri, 25 Oct 2019 11:40:09 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=0c8b2267407ef681e2aba63b561a3c6b56a0fb7c;hp=9b8645f896fefd9b0bff4e84d252cbabd7832fb9;p=dss.git

Merge branch 'master' into next

* master:
  daemon_init(): Do not set umask to zero.
  Fix logic to append slash to the source directory.
---

diff --git a/daemon.c b/daemon.c
index 709785b..ad73061 100644
--- a/daemon.c
+++ b/daemon.c
@@ -60,7 +60,6 @@ int daemon_init(void)
 	/* become session leader */
 	if (setsid() < 0)
 		goto err;
-	umask(0);
 	null = open("/dev/null", O_RDWR);
 	if (null < 0)
 		goto err;
diff --git a/dss.c b/dss.c
index 1354aa7..f61f335 100644
--- a/dss.c
+++ b/dss.c
@@ -1458,7 +1458,7 @@ static void create_rsync_argv(char ***argv, int64_t *num)
 					OPT_STRING_VAL(DSS, REMOTE_USER) : logname,
 				OPT_STRING_VAL(DSS, REMOTE_HOST),
 				lls_string_val(j, OPT_RESULT(DSS, SOURCE_DIR)),
-				N == 1? "/" : ""
+				OPT_GIVEN(DSS, SOURCE_DIR) == 1? "/" : ""
 			);
 		}
 	}