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
Got rid of some code from writefd_unbuffered() that was only needed
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
d354ef7
..
7c46c70
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-100,7
+100,7
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
ret = start_inband_exchange(user, path, fd, fd, argc);
ret = start_inband_exchange(user, path, fd, fd, argc);
- return ret
< 0
? ret : client_run(fd, fd, -1, argc, argv);
+ return ret ? ret : client_run(fd, fd, -1, argc, argv);
}
int start_inband_exchange(char *user, char *path, int f_in, int f_out,
}
int start_inband_exchange(char *user, char *path, int f_in, int f_out,
@@
-196,10
+196,10
@@
int start_inband_exchange(char *user, char *path, int f_in, int f_out,
rprintf(FERROR, "%s\n", line);
/* This is always fatal; the server will now
* close the socket. */
rprintf(FERROR, "%s\n", line);
/* This is always fatal; the server will now
* close the socket. */
- return RERR_STARTCLIENT;
- } else {
- rprintf(FINFO,"%s\n", line);
+ return -1;
}
}
+
+ rprintf(FINFO, "%s\n", line);
}
kluge_around_eof = 0;
}
kluge_around_eof = 0;
@@
-268,11
+268,9
@@
static int rsync_module(int f_in, int f_out, int i)
return -1;
}
return -1;
}
- auth_user = auth_server(f_in, f_out, i, addr, "@RSYNCD: AUTHREQD ");
+ auth_user = auth_server(f_in, f_out, i,
host,
addr, "@RSYNCD: AUTHREQD ");
if (!auth_user) {
if (!auth_user) {
- rprintf(FLOG, "auth failed on module %s from %s (%s)\n",
- name, host, addr);
io_printf(f_out, "@ERROR: auth failed on module %s\n", name);
return -1;
}
io_printf(f_out, "@ERROR: auth failed on module %s\n", name);
return -1;
}