X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/27d3cdbc943a57d64f4f2a35a4f1e1b15d9ca41f..654175798bdbdd6403e10c8fa74e8586b3612ea1:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index f7293bf5..4b8ed53b 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -24,6 +24,7 @@ extern int module_id;
 extern int read_only;
 extern int verbose;
 extern int rsync_port;
+char *auth_user;
 
 int start_socket_client(char *host, char *path, int argc, char *argv[])
 {
@@ -55,7 +56,7 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
 
 	fd = open_socket_out(host, rsync_port);
 	if (fd == -1) {
-		exit_cleanup(1);
+		exit_cleanup(RERR_SOCKETIO);
 	}
 	
 	server_options(sargs,&sargc);
@@ -121,7 +122,6 @@ 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 use_chroot = lp_use_chroot(i);
 	int start_glob=0;
 	int ret;
@@ -153,9 +153,9 @@ static int rsync_module(int fd, int i)
 	}
 
 	
-	user = auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ");
+	auth_user = auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ");
 
-	if (!user) {
+	if (!auth_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);
@@ -285,10 +285,10 @@ static int rsync_module(int fd, int i)
 	ret = parse_arguments(argc, argv);
 
 	if (request) {
-		if (*user) {
+		if (*auth_user) {
 			rprintf(FINFO,"rsync %s %s from %s@%s (%s)\n",
 				am_sender?"on":"to",
-				request, user, host, addr);
+				request, auth_user, host, addr);
 		} else {
 			rprintf(FINFO,"rsync %s %s from %s (%s)\n",
 				am_sender?"on":"to",
@@ -311,7 +311,7 @@ static int rsync_module(int fd, int i)
 
 	if (!ret) {
 		rprintf(FERROR,"Error parsing options (unsupported option?) - aborting\n");
-		exit_cleanup(1);
+		exit_cleanup(RERR_SYNTAX);
 	}
 
 	start_server(fd, fd, argc, argp);
@@ -343,7 +343,7 @@ static int start_daemon(int fd)
 	extern int remote_version;
 
 	if (!lp_load(config_file, 0)) {
-		exit_cleanup(1);
+		exit_cleanup(RERR_SYNTAX);
 	}
 
 	set_socket_options(fd,"SO_KEEPALIVE");
@@ -433,7 +433,7 @@ int daemon_main(void)
 
 	if (!lp_load(config_file, 1)) {
 		fprintf(stderr,"failed to load config file %s\n", config_file);
-		exit_cleanup(1);
+		exit_cleanup(RERR_SYNTAX);
 	}
 
 	log_open();
@@ -447,7 +447,7 @@ int daemon_main(void)
 		if ((f = fopen(lp_pid_file(), "w")) == NULL) {
 		    cleanup_set_pid(0);
 		    fprintf(stderr,"failed to create pid file %s\n", pid_file);
-		    exit_cleanup(1);
+		    exit_cleanup(RERR_FILEIO);
 		}
 		fprintf(f, "%d\n", pid);
 		fclose(f);