Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use new pathjoin() function.
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
5c931fa
..
f38a495
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-129,7
+129,7
@@
int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc)
sargs[sargc] = NULL;
sargs[sargc] = NULL;
- io_printf(f_out, "@RSYNCD: %d\n",
PROTOCOL_VERSION
);
+ io_printf(f_out, "@RSYNCD: %d\n",
protocol_version
);
if (!read_line(f_in, line, sizeof(line)-1)) {
rprintf(FERROR, "rsync: did not see server greeting\n");
if (!read_line(f_in, line, sizeof(line)-1)) {
rprintf(FERROR, "rsync: did not see server greeting\n");
@@
-192,7
+192,7
@@
int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc)
io_printf(f_out, "\n");
if (protocol_version < 23) {
io_printf(f_out, "\n");
if (protocol_version < 23) {
- if (protocol_version == 22 ||
(protocol_version > 17 && !am_sender)
)
+ if (protocol_version == 22 ||
!am_sender
)
io_start_multiplex_in(f_in);
}
io_start_multiplex_in(f_in);
}
@@
-457,7
+457,7
@@
static int rsync_module(int f_in, int f_out, int i)
#endif
if (protocol_version < 23) {
#endif
if (protocol_version < 23) {
- if (protocol_version == 22 ||
(protocol_version > 17 && am_sender)
)
+ if (protocol_version == 22 ||
am_sender
)
io_start_multiplex_out(f_out);
}
io_start_multiplex_out(f_out);
}
@@
-522,7
+522,7
@@
int start_daemon(int f_in, int f_out)
set_nonblocking(f_in);
}
set_nonblocking(f_in);
}
- io_printf(f_out, "@RSYNCD: %d\n",
PROTOCOL_VERSION
);
+ io_printf(f_out, "@RSYNCD: %d\n",
protocol_version
);
motd = lp_motd_file();
if (motd && *motd) {
motd = lp_motd_file();
if (motd && *motd) {