X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/bcb7e50250111ebfd299355783201223097212bd..5805327b2852e2e65bd409f1d322353128690be5:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 7fca65ec..244bbc68 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -109,26 +109,33 @@ static int rsync_module(int fd, int i)
 	char *addr = client_addr(fd);
 	char *host = client_name(fd);
 	char *auth;
+	char *name = lp_name(i);
+	int start_glob=0;
 
 	if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
 		rprintf(FERROR,"rsync denied on module %s from %s (%s)\n",
-			lp_name(i), client_name(fd), client_addr(fd));
+			name, client_name(fd), client_addr(fd));
+		io_printf(fd,"@ERROR: access denied to %s from %s (%s)\n",
+			  name, client_name(fd), client_addr(fd));
 		return -1;
 	}
 
 	if (!auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ")) {
 		rprintf(FERROR,"auth failed on module %s from %s (%s)\n",
-			lp_name(i), client_name(fd), client_addr(fd));
+			name, client_name(fd), client_addr(fd));
+		io_printf(fd,"@ERROR: auth failed on module %s\n",name);
 		return -1;		
 	}
 
 	if (!claim_connection(lp_lock_file(), lp_max_connections())) {
-		rprintf(FERROR,"ERROR: max connections reached\n");
+		rprintf(FERROR,"max connections (%d) reached\n",
+			lp_max_connections());
+		io_printf(fd,"@ERROR: max connections (%d) reached - try again later\n", lp_max_connections());
 		return -1;
 	}
 
 	rprintf(FINFO,"rsync on module %s from %s (%s)\n",
-		lp_name(i), host, addr);
+		name, host, addr);
 	
 	module_id = i;
 
@@ -139,6 +146,7 @@ static int rsync_module(int fd, int i)
 	if (!name_to_uid(p, &uid)) {
 		if (!isdigit(*p)) {
 			rprintf(FERROR,"Invalid uid %s\n", p);
+			io_printf(fd,"@ERROR: invalid uid\n");
 			return -1;
 		} 
 		uid = atoi(p);
@@ -148,11 +156,18 @@ static int rsync_module(int fd, int i)
 	if (!name_to_gid(p, &gid)) {
 		if (!isdigit(*p)) {
 			rprintf(FERROR,"Invalid gid %s\n", p);
+			io_printf(fd,"@ERROR: invalid gid\n");
 			return -1;
 		} 
 		gid = atoi(p);
 	}
 
+	p = lp_exclude_from(i);
+	add_exclude_file(p, 1);
+
+	p = lp_exclude(i);
+	add_exclude_line(p);
+
 	if (chroot(lp_path(i))) {
 		io_printf(fd,"@ERROR: chroot failed\n");
 		return -1;
@@ -184,12 +199,28 @@ static int rsync_module(int fd, int i)
 
 		if (!*line) break;
 
-		argv[argc] = strdup(line);
+		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;
 		}
 
-		argc++;
+		if (start_glob) {
+			glob_expand(argv, &argc, MAX_ARGS);
+		} else {
+			argc++;
+		}
+
+		if (strcmp(line,".") == 0) {
+			start_glob = 1;
+		}
+
 		if (argc == MAX_ARGS) {
 			return -1;
 		}
@@ -259,6 +290,7 @@ static int start_daemon(int fd)
 	}
 
 	if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) {
+		io_printf(fd,"@ERROR: protocol startup error\n");
 		return -1;
 	}	
 
@@ -275,13 +307,13 @@ static int start_daemon(int fd)
 
 		if (*line == '#') {
 			/* it's some sort of command that I don't understand */
-			io_printf(fd,"ERROR: Unknown command '%s'\n", line);
+			io_printf(fd,"@ERROR: Unknown command '%s'\n", line);
 			return -1;
 		}
 
 		i = lp_number(line);
 		if (i == -1) {
-			io_printf(fd,"ERROR: Unknown module '%s'\n", line);
+			io_printf(fd,"@ERROR: Unknown module '%s'\n", line);
 			return -1;
 		}
 	}