X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8f04bb36e7f8070591f88114be99be644f637083..7a55d06e0d6771625ed2041f08470f2cdbd25965:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 00efea49..82c25def 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -44,7 +44,8 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
 	extern int am_sender;
 	extern struct in_addr socket_address;
 	extern char *shell_cmd;
-
+	extern int kludge_around_eof;
+	
 	if (argc == 0 && !am_sender) {
 		extern int list_only;
 		list_only = 1;
@@ -107,6 +108,10 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
 	if (p) *p = '/';
 
 	while (1) {
+		/* Old servers may just drop the connection here,
+		   rather than sending a proper EXIT command.  Yuck. */
+		kludge_around_eof= True;
+
 		if (!read_line(fd, line, sizeof(line)-1)) {
 			return -1;
 		}
@@ -122,6 +127,7 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
 
 		rprintf(FINFO,"%s\n", line);
 	}
+	kludge_around_eof = False;
 
 	for (i=0;i<sargc;i++) {
 		io_printf(fd,"%s\n", sargs[i]);
@@ -261,13 +267,13 @@ static int rsync_module(int fd, int i)
 
 	if (am_root) {
 		if (setgid(gid)) {
-			rsyserr(FERROR, errno, "setgid %d failed", gid);
+			rsyserr(FERROR, errno, "setgid %d failed", (int) gid);
 			io_printf(fd,"@ERROR: setgid failed\n");
 			return -1;
 		}
 
 		if (setuid(uid)) {
-			rsyserr(FERROR, errno, "setuid %d failed", uid);
+			rsyserr(FERROR, errno, "setuid %d failed", (int) uid);
 			io_printf(fd,"@ERROR: setuid failed\n");
 			return -1;
 		}