summaryrefslogtreecommitdiff
path: root/clientserver.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2004-07-31 19:55:42 +0000
committerWayne Davison <wayned@samba.org>2004-07-31 19:55:42 +0000
commitbf4679e8a080ad6eb7cd7799ba09f8578da54c17 (patch)
tree856b9bbcfa7bd107638eddb8180fbfc3663809d3 /clientserver.c
parentc4054610c89693b650f811b6b40b53ec7b252bce (diff)
downloadrsync-bf4679e8a080ad6eb7cd7799ba09f8578da54c17.tar.gz
rsync-bf4679e8a080ad6eb7cd7799ba09f8578da54c17.tar.bz2
rsync-bf4679e8a080ad6eb7cd7799ba09f8578da54c17.zip
If we need to return an error during the startup phase and the other
side is expecting us to send them a files-from list, send the list terminator before sending the error.
Diffstat (limited to 'clientserver.c')
-rw-r--r--clientserver.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/clientserver.c b/clientserver.c
index ac99ae4e..339c15d1 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -50,6 +50,7 @@ extern char *bind_address;
extern struct exclude_list_struct server_exclude_list;
extern char *exclude_path_prefix;
extern char *config_file;
+extern char *files_from;
char *auth_user;
@@ -461,6 +462,8 @@ static int rsync_module(int f_in, int f_out, int i)
* get the error back to the client. This means getting
* the protocol setup finished first in later versions. */
setup_protocol(f_out, f_in);
+ if (files_from && !am_sender && strcmp(files_from, "-") != 0)
+ write_byte(f_out, 0);
io_start_multiplex_out();
}