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 (!user) user = getenv("USER");
if (!user) user = getenv("LOGNAME");
- fd = open_socket_out(host, rsync_port, &socket_address);
+ fd = open_socket_out_wrapped (host, rsync_port, &socket_address);
if (fd == -1) {
exit_cleanup(RERR_SOCKETIO);
}
io_printf(fd,"%s\n",path);
if (p) *p = '/';
+ /* Old servers may just drop the connection here,
+ rather than sending a proper EXIT command. Yuck. */
+ kludge_around_eof = remote_version < 25;
+
while (1) {
if (!read_line(fd, line, sizeof(line)-1)) {
return -1;
rprintf(FINFO,"%s\n", line);
}
+ kludge_around_eof = False;
for (i=0;i<sargc;i++) {
io_printf(fd,"%s\n", sargs[i]);
log_init();
if (use_chroot) {
+ /* TODO: If we're not running as root, then we'll get
+ * an error here. I wonder if we should perhaps just
+ * log a warning here, and continue anyhow using the
+ * push_dir feature? -- mbp 2001-08-31 */
if (chroot(lp_path(i))) {
rsyserr(FERROR, errno, "chroot %s failed", lp_path(i));
io_printf(fd,"@ERROR: chroot failed\n");
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)) {
- rsyserr(FERROR, errno, "setuid %d failed", uid);
+ rsyserr(FERROR, errno, "setuid %d failed", (int) uid);
io_printf(fd,"@ERROR: setuid failed\n");
return -1;
}
{
int n = lp_numservices();
int i;
-
+ extern int remote_version;
+
for (i=0;i<n;i++)
if (lp_list(i))
io_printf(fd, "%-15s\t%s\n", lp_name(i), lp_comment(i));
- io_printf(fd, "@RSYNCD: EXIT\n");
+ if (remote_version >= 25)
+ io_printf(fd,"@RSYNCD: EXIT\n");
}
/* this is called when a socket connection is established to a client