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
Allow the server to terminate the module list by just closing the
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
00efea4
..
82c25de
100644
(file)
--- 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 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;
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) {
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;
}
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);
}
rprintf(FINFO,"%s\n", line);
}
+ kludge_around_eof = False;
for (i=0;i<sargc;i++) {
io_printf(fd,"%s\n", sargs[i]);
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)) {
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)) {
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;
}
io_printf(fd,"@ERROR: setuid failed\n");
return -1;
}