X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1a016bfdec2823c6d4e78a3dcc253cdfc30a10af..d0d56395c8a150f72b6189e027fe9af918e23551:/clientserver.c?ds=sidebyside

diff --git a/clientserver.c b/clientserver.c
index 9cac2ef3..44395357 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -109,7 +109,10 @@ static int rsync_module(int fd, int i)
 	char *addr = client_addr(fd);
 	char *host = client_name(fd);
 	char *name = lp_name(i);
+	char *user;
 	int start_glob=0;
+	char *request=NULL;
+	extern int am_sender;
 
 	if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
 		rprintf(FERROR,"rsync denied on module %s from %s (%s)\n",
@@ -119,13 +122,6 @@ static int rsync_module(int fd, int i)
 		return -1;
 	}
 
-	if (!auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ")) {
-		rprintf(FERROR,"auth failed on module %s from %s (%s)\n",
-			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,"max connections (%d) reached\n",
 			lp_max_connections());
@@ -134,6 +130,15 @@ static int rsync_module(int fd, int i)
 	}
 
 	
+	user = auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ");
+
+	if (!user) {
+		rprintf(FERROR,"auth failed on module %s from %s (%s)\n",
+			name, client_name(fd), client_addr(fd));
+		io_printf(fd,"@ERROR: auth failed on module %s\n",name);
+		return -1;		
+	}
+
 	module_id = i;
 
 	if (lp_read_only(i))
@@ -211,8 +216,7 @@ static int rsync_module(int fd, int i)
 
 		if (start_glob) {
 			if (start_glob == 1) {
-				rprintf(FINFO,"rsync on %s from %s (%s)\n",
-					p, host, addr);
+				request = strdup(p);
 				start_glob++;
 			}
 			glob_expand(name, argv, &argc, MAX_ARGS);
@@ -231,6 +235,19 @@ static int rsync_module(int fd, int i)
 
 	parse_arguments(argc, argv);
 
+	if (request) {
+		if (*user) {
+			rprintf(FINFO,"rsync %s %s from %s@%s (%s)\n",
+				am_sender?"on":"to",
+				request, user, host, addr);
+		} else {
+			rprintf(FINFO,"rsync %s %s from %s (%s)\n",
+				am_sender?"on":"to",
+				request, host, addr);
+		}
+		free(request);
+	}
+
 	/* don't allow the logs to be flooded too fast */
 	if (verbose > 1) verbose = 1;
 
@@ -266,11 +283,13 @@ static int start_daemon(int fd)
 	extern char *config_file;
 	extern int remote_version;
 
-	if (!lp_load(config_file)) {
+	if (!lp_load(config_file, 0)) {
 		exit_cleanup(1);
 	}
 
 	set_socket_options(fd,"SO_KEEPALIVE");
+	set_socket_options(fd,lp_socket_options());
+	
 
 	io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
 
@@ -327,7 +346,7 @@ static int start_daemon(int fd)
 
 int daemon_main(void)
 {
-	log_open();
+	extern char *config_file;
 
 	if (is_a_socket(STDIN_FILENO)) {
 		/* we are running via inetd */
@@ -336,6 +355,13 @@ int daemon_main(void)
 
 	become_daemon();
 
+	if (!lp_load(config_file, 1)) {
+		fprintf(stderr,"failed to load config file %s\n", config_file);
+		exit_cleanup(1);
+	}
+
+	log_open();
+
 	rprintf(FINFO,"rsyncd version %s starting\n",VERSION);
 
 	start_accept_loop(rsync_port, start_daemon);