Fix check when to use rsync locally.

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index 86e83827f50991fc9460eb44c71b45211b7fc1a8..f8a1e5132dfd3954bd2242b2f38d6deb384ffa9e 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -502,6 +502,8 @@ static int handle_rsync_exit(int status)
                DSS_WARNING_LOG("rsync process %d returned %d -- restarting\n",
                        (int)rsync_pid, es);
                snapshot_creation_status = SCS_RSYNC_NEEDS_RESTART;
+               gettimeofday(&next_snapshot_time, NULL);
+               next_snapshot_time.tv_sec += 60;
                ret = 1;
                goto out;
        }
@@ -693,6 +695,21 @@ out:
        return ret;
 }
 
+/*
+ * We can not use rsync locally if the local user is different from the remote
+ * user or if the src dir is not on the local host (or both).
+ */
+static int use_rsync_locally(char *logname)
+{
+       char *h = conf.remote_host_arg;
+
+       if (strcmp(h, "localhost") && strcmp(h, "127.0.0.1"))
+               return 0;
+       if (conf.remote_user_given && strcmp(conf.remote_user_arg, logname))
+               return 0;
+       return 1;
+}
+
 static void create_rsync_argv(char ***argv, int64_t *num)
 {
        char *logname, *newest;
@@ -716,7 +733,7 @@ static void create_rsync_argv(char ***argv, int64_t *num)
        } else
                DSS_INFO_LOG("no previous snapshot found\n");
        logname = dss_logname();
-       if (conf.remote_user_given && !strcmp(conf.remote_user_arg, logname))
+       if (use_rsync_locally(logname))
                (*argv)[i++] = dss_strdup(conf.source_dir_arg);
        else
                (*argv)[i++] = make_message("%s@%s:%s/", conf.remote_user_given?