X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b52c1d9d3aec51afbc9d1c5561d2b70d8bcecf54..805edf9d7dee5467c6054d6d65fba6d357ea57ca:/clientserver.c diff --git a/clientserver.c b/clientserver.c index 84858861..9cda2a0b 100644 --- a/clientserver.c +++ b/clientserver.c @@ -1,7 +1,7 @@ /* -*- c-file-style: "linux"; -*- Copyright (C) 1998-2001 by Andrew Tridgell - Copyright (C) 2001 by Martin Pool + Copyright (C) 2001-2002 by Martin Pool This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,12 +27,16 @@ extern int read_only; extern int verbose; extern int rsync_port; char *auth_user; -int sanitize_paths = 0; +extern int sanitize_paths; -/* +/** * Run a client connected to an rsyncd. The alternative to this - * function for remote-shell connections is do_cmd. - */ + * function for remote-shell connections is do_cmd(). + * + * After initial server startup, hands over to client_run(). + * + * @return -1 for error in startup, or the result of client_run(). + **/ int start_socket_client(char *host, char *path, int argc, char *argv[]) { int fd, i; @@ -42,10 +46,12 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) char *p, *user=NULL; extern int remote_version; extern int am_sender; - extern struct in_addr socket_address; extern char *shell_cmd; + extern int list_only; extern int kludge_around_eof; - + extern char *bind_address; + extern int default_af_hint; + if (argc == 0 && !am_sender) { extern int list_only; list_only = 1; @@ -78,7 +84,15 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) if (!user) user = getenv("USER"); if (!user) user = getenv("LOGNAME"); - fd = open_socket_out_wrapped (host, rsync_port, &socket_address); + if (verbose >= 2) { + /* FIXME: If we're going to use a socket program for + * testing, then this message is wrong. We need to + * say something like "(except really using %s)" */ + rprintf(FINFO, "opening tcp connection to %s port %d\n", + host, rsync_port); + } + fd = open_socket_out_wrapped (host, rsync_port, bind_address, + default_af_hint); if (fd == -1) { exit_cleanup(RERR_SOCKETIO); } @@ -95,10 +109,14 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION); if (!read_line(fd, line, sizeof(line)-1)) { + rprintf(FERROR, "rsync: did not see server greeting\n"); return -1; } if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) { + /* note that read_line strips of \n or \r */ + rprintf(FERROR, "rsync: server sent \"%s\" rather than greeting\n", + line); return -1; } @@ -109,10 +127,11 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) /* Old servers may just drop the connection here, rather than sending a proper EXIT command. Yuck. */ - kludge_around_eof = remote_version < 25; + kludge_around_eof = list_only && (remote_version < 25); while (1) { if (!read_line(fd, line, sizeof(line)-1)) { + rprintf(FERROR, "rsync: didn't get server startup line\n"); return -1; } @@ -125,7 +144,10 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) if (strcmp(line,"@RSYNCD: EXIT") == 0) exit(0); - rprintf(FINFO,"%s\n", line); + if (strncmp(line, "@ERROR", 6) == 0) + rprintf(FERROR,"%s\n", line); + else + rprintf(FINFO,"%s\n", line); } kludge_around_eof = False; @@ -166,9 +188,9 @@ static int rsync_module(int fd, int i) if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) { rprintf(FERROR,"rsync denied on module %s from %s (%s)\n", - name, client_name(fd), client_addr(fd)); + name, host, addr); io_printf(fd,"@ERROR: access denied to %s from %s (%s)\n", - name, client_name(fd), client_addr(fd)); + name, host, addr); return -1; } @@ -278,6 +300,26 @@ static int rsync_module(int fd, int i) } if (am_root) { +#ifdef HAVE_SETGROUPS + /* Get rid of any supplementary groups this process + * might have inheristed. */ + if (setgroups(0, NULL)) { + rsyserr(FERROR, errno, "setgroups failed"); + io_printf(fd, "@ERROR: setgroups failed\n"); + return -1; + } +#endif + + /* XXXX: You could argue that if the daemon is started + * by a non-root user and they explicitly specify a + * gid, then we should try to change to that gid -- + * this could be possible if it's already in their + * supplementary groups. */ + + /* TODO: Perhaps we need to document that if rsyncd is + * started by somebody other than root it will inherit + * all their supplementary groups. */ + if (setgid(gid)) { rsyserr(FERROR, errno, "setgid %d failed", (int) gid); io_printf(fd,"@ERROR: setgid failed\n"); @@ -485,6 +527,7 @@ int daemon_main(void) extern char *config_file; extern int orig_umask; char *pid_file; + extern int no_detach; if (is_a_socket(STDIN_FILENO)) { int i; @@ -500,7 +543,8 @@ int daemon_main(void) return start_daemon(STDIN_FILENO); } - become_daemon(); + if (!no_detach) + become_daemon(); if (!lp_load(config_file, 1)) { exit_cleanup(RERR_SYNTAX); @@ -508,10 +552,12 @@ int daemon_main(void) log_init(); - rprintf(FINFO, "rsyncd version %s starting, listening on port %d\n", VERSION, + rprintf(FINFO, "rsyncd version %s starting, listening on port %d\n", + RSYNC_VERSION, rsync_port); /* TODO: If listening on a particular address, then show that - * address too. */ + * address too. In fact, why not just do inet_ntop on the + * local address??? */ if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) { char pidbuf[16];