X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7a6421fa764dd0f609e2a5024ec8b3bc577575a1..91eee5946ad6d033303abfe184085c87a283da29:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 38bb171d..39e5b90d 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -32,7 +32,7 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
 	int sargc=0;
 	char line[1024];
 	char *p;
-	int version;
+	extern int remote_version;
 
 	fd = open_socket_out(host, rsync_port);
 	if (fd == -1) {
@@ -48,16 +48,16 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
 
 	sargs[sargc] = NULL;
 
+	io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
+
 	if (!read_line(fd, line, sizeof(line)-1)) {
 		return -1;
 	}
 
-	if (sscanf(line,"@RSYNCD: %d", &version) != 1) {
+	if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) {
 		return -1;
 	}
 
-	io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
-
 	p = strchr(path,'/');
 	if (p) *p = 0;
 	io_printf(fd,"%s\n",path);
@@ -96,13 +96,48 @@ static int rsync_module(int fd, int i)
 	char *argv[MAX_ARGS];
 	char **argp;
 	char line[1024];
+	uid_t uid;
+	gid_t gid;
+	char *p;
+	char *addr = client_addr(fd);
+	char *host = client_name(fd);
+
+	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));
+		return -1;
+	}
+
+	if (!claim_connection(lp_lock_file(), lp_max_connections())) {
+		rprintf(FERROR,"ERROR: max connections reached\n");
+		return -1;
+	}
+
+	rprintf(FINFO,"rsync on module %s from %s (%s)\n",
+		lp_name(i), host, addr);
 
 	module_id = i;
 
 	if (lp_read_only(i))
 		read_only = 1;
 
-	rprintf(FERROR,"rsyncd starting\n");
+	p = lp_uid(i);
+	if (!name_to_uid(p, &uid)) {
+		if (!isdigit(*p)) {
+			rprintf(FERROR,"Invalid uid %s\n", p);
+			return -1;
+		} 
+		uid = atoi(p);
+	}
+
+	p = lp_gid(i);
+	if (!name_to_gid(p, &gid)) {
+		if (!isdigit(*p)) {
+			rprintf(FERROR,"Invalid gid %s\n", p);
+			return -1;
+		} 
+		gid = atoi(p);
+	}
 
 	if (chroot(lp_path(i))) {
 		io_printf(fd,"@ERROR: chroot failed\n");
@@ -114,12 +149,12 @@ static int rsync_module(int fd, int i)
 		return -1;
 	}
 
-	if (setgid(lp_gid(i))) {
+	if (setgid(gid)) {
 		io_printf(fd,"@ERROR: setgid failed\n");
 		return -1;
 	}
 
-	if (setuid(lp_uid(i))) {
+	if (setuid(uid)) {
 		io_printf(fd,"@ERROR: setuid failed\n");
 		return -1;
 	}
@@ -179,20 +214,18 @@ static int start_daemon(int fd)
 {
 	char line[200];
 	char *motd;
-	int version;
+	int i = -1;
+	extern char *config_file;
+	extern int remote_version;
+
+	if (!lp_load(config_file)) {
+		exit_cleanup(1);
+	}
 
 	set_socket_options(fd,"SO_KEEPALIVE");
 
 	io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
 
-	if (!read_line(fd, line, sizeof(line)-1)) {
-		return -1;
-	}
-
-	if (sscanf(line,"@RSYNCD: %d", &version) != 1) {
-		return -1;
-	}	
-
 	motd = lp_motd_file();
 	if (*motd) {
 		FILE *f = fopen(motd,"r");
@@ -207,8 +240,15 @@ static int start_daemon(int fd)
 		io_printf(fd,"\n");
 	}
 
-	while (1) {
-		int i;
+	if (!read_line(fd, line, sizeof(line)-1)) {
+		return -1;
+	}
+
+	if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) {
+		return -1;
+	}	
+
+	while (i == -1) {
 
 		line[0] = 0;
 		if (!read_line(fd, line, sizeof(line)-1)) {
@@ -231,22 +271,14 @@ static int start_daemon(int fd)
 			io_printf(fd,"ERROR: Unknown module '%s'\n", line);
 			return -1;
 		}
-
-		return rsync_module(fd, i);
 	}
 
-	return 0;
+	return rsync_module(fd, i);
 }
 
 
 int daemon_main(void)
 {
-	extern char *config_file;
-
-	if (!lp_load(config_file)) {
-		exit_cleanup(1);
-	}
-
 	if (is_a_socket(STDIN_FILENO)) {
 		/* we are running via inetd */
 		return start_daemon(STDIN_FILENO);
@@ -254,6 +286,7 @@ int daemon_main(void)
 
 	become_daemon();
 
-	return start_accept_loop(rsync_port, start_daemon);
+	start_accept_loop(rsync_port, start_daemon);
+	return -1;
 }