From: Andre Noll <maan@systemlinux.org>
Date: Mon, 8 Dec 2008 16:21:51 +0000 (+0100)
Subject: Merge commit 'sio/master'
X-Git-Tag: v0.1.2~5
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=693e5a961e1d1a67ae2c2501913bf77881ebbb19;hp=d3d49ea7e243d0f061c2d1797da166f2cf4b9afd;p=dss.git

Merge commit 'sio/master'
---

diff --git a/dss.c b/dss.c
index af02f1c..f8a1e51 100644
--- a/dss.c
+++ b/dss.c
@@ -695,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;
@@ -718,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?