X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8f3a2d54a6d3ffa7eefa13478c67ccfa9a3df513..e42c9458c2f1e3a78d6d45e99741d6edb38fc0cc:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 33e7b444..1c0bd7ec 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -30,7 +30,7 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
 	int fd, i;
 	char *sargs[MAX_ARGS];
 	int sargc=0;
-	char line[1024];
+	char line[MAXPATHLEN];
 	char *p, *user=NULL;
 	extern int remote_version;
 
@@ -102,13 +102,12 @@ static int rsync_module(int fd, int i)
 	int argc=0;
 	char *argv[MAX_ARGS];
 	char **argp;
-	char line[1024];
+	char line[MAXPATHLEN];
 	uid_t uid;
 	gid_t gid;
 	char *p;
 	char *addr = client_addr(fd);
 	char *host = client_name(fd);
-	char *auth;
 	char *name = lp_name(i);
 	int start_glob=0;
 
@@ -165,7 +164,7 @@ static int rsync_module(int fd, int i)
 	p = lp_exclude_from(i);
 	add_exclude_file(p, 1);
 
-	p = lp_exclude_from(i);
+	p = lp_exclude(i);
 	add_exclude_line(p);
 
 	if (chroot(lp_path(i))) {
@@ -201,18 +200,14 @@ static int rsync_module(int fd, int i)
 
 		p = line;
 
-		if (start_glob && strncmp(p, name, strlen(name)) == 0) {
-			p += strlen(name);
-			if (!*p) p = ".";
-		}
-
 		argv[argc] = strdup(p);
 		if (!argv[argc]) {
 			return -1;
 		}
 
 		if (start_glob) {
-			glob_expand(argv, &argc, MAX_ARGS);
+			rprintf(FINFO,"transferring %s\n",p);
+			glob_expand(name, argv, &argc, MAX_ARGS);
 		} else {
 			argc++;
 		}
@@ -331,6 +326,8 @@ int daemon_main(void)
 
 	become_daemon();
 
+	rprintf(FINFO,"rsyncd version %s starting\n",VERSION);
+
 	start_accept_loop(rsync_port, start_daemon);
 	return -1;
 }