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 709785b437041654e3cacd2fd4f252aea8fa4173..ad73061c14ec5916284f2ab67438306d6484827d 100644 (file)
--- 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 1354aa757128d1ec6069290f7c8303991e6eeb5c..f61f33597d7863e236a804d6c0541934e6ced8d5 100644 (file)
--- 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? "/" : ""
                        );
                }
        }