X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3591c0660c52cec9fa06e7539b56604a7499fa10..ff8b29b8c62f377ede40fbf0cbbaa428bd8df60a:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 6d6e01d6..71188e97 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -48,11 +48,6 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
 
 	sargs[sargc] = NULL;
 
-	p = strchr(path,'/');
-	if (p) *p = 0;
-	io_printf(fd,"%s\n",path);
-	if (p) *p = '/';
-
 	if (!read_line(fd, line, sizeof(line)-1)) {
 		return -1;
 	}
@@ -61,6 +56,13 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
 		return -1;
 	}
 
+	io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
+
+	p = strchr(path,'/');
+	if (p) *p = 0;
+	io_printf(fd,"%s\n",path);
+	if (p) *p = '/';
+
 	while (1) {
 		if (!read_line(fd, line, sizeof(line)-1)) {
 			return -1;
@@ -94,13 +96,35 @@ 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;
+
+	rprintf(FINFO,"rsync on module %s from %s (%s)\n",
+		lp_name(i), client_name(fd), client_addr(fd));
 
 	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");
@@ -112,12 +136,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;
 	}
@@ -158,6 +182,8 @@ static int rsync_module(int fd, int i)
 	return 0;
 }
 
+/* send a list of available modules to the client. Don't list those
+   with "list = False". */
 static void send_listing(int fd)
 {
 	int n = lp_numservices();
@@ -173,13 +199,23 @@ static void send_listing(int fd)
    here */
 static int start_daemon(int fd)
 {
-	char line[1024];
+	char line[200];
 	char *motd;
+	int version;
+	int i = -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");
@@ -194,9 +230,7 @@ static int start_daemon(int fd)
 		io_printf(fd,"\n");
 	}
 
-	/* read a single line indicating the resource that is wanted */
-	while (1) {
-		int i;
+	while (i == -1) {
 
 		line[0] = 0;
 		if (!read_line(fd, line, sizeof(line)-1)) {
@@ -219,17 +253,17 @@ 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)
 {
-	if (!lp_load(RSYNCD_CONF)) {
+	extern char *config_file;
+
+	if (!lp_load(config_file)) {
 		exit_cleanup(1);
 	}
 
@@ -240,6 +274,7 @@ int daemon_main(void)
 
 	become_daemon();
 
-	return start_accept_loop(rsync_port, start_daemon);
+	start_accept_loop(rsync_port, start_daemon);
+	return -1;
 }