X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/503114a78223b8f5ebaed787aa68496984a3e4d9..556e03a3c9ad79698c97b27a56387e85f5f4a7b8:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 00c492b1..1cb6a09e 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -24,6 +24,7 @@
 
 extern int verbose;
 extern int quiet;
+extern int output_motd;
 extern int list_only;
 extern int am_sender;
 extern int am_server;
@@ -205,7 +206,10 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out,
 			return -1;
 		}
 
-		rprintf(FINFO, "%s\n", line);
+		/* This might be a MOTD line or a module listing, but there is
+		 * no way to differentiate it.  The manpage mentions this. */
+		if (output_motd)
+			rprintf(FINFO, "%s\n", line);
 	}
 	kluge_around_eof = 0;
 
@@ -503,7 +507,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
 			return -1;
 		}
 
-		if (!push_dir("/")) {
+		if (!push_dir("/", 0)) {
 			rsyserr(FLOG, errno, "chdir %s failed\n",
 				lp_path(i));
 			io_printf(f_out, "@ERROR: chdir failed\n");
@@ -511,7 +515,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
 		}
 
 	} else {
-		if (!push_dir(lp_path(i))) {
+		if (!push_dir(lp_path(i), 0)) {
 			rsyserr(FLOG, errno, "chdir %s failed\n",
 				lp_path(i));
 			io_printf(f_out, "@ERROR: chdir failed\n");