X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1264288cb551c516d46f36cdc8704b22f33321f7..fdf88d7574cfd4fba8f4cb8b2a84168b57e456e8:/clientserver.c diff --git a/clientserver.c b/clientserver.c index 1a638db5..0ba2d0cd 100644 --- a/clientserver.c +++ b/clientserver.c @@ -1,24 +1,29 @@ /* -*- c-file-style: "linux"; -*- - - Copyright (C) 1998-2001 by Andrew Tridgell - Copyright (C) 2001 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -/* the socket based protocol for setting up a connection with rsyncd */ + * + * Copyright (C) 1998-2001 by Andrew Tridgell + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/** + * @file + * + * The socket based protocol for setting up a connection with + * rsyncd. + **/ #include "rsync.h" @@ -27,12 +32,21 @@ 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 negotiating which module to use and reading the server's + * motd, this hands over to client_run(). Telling the server the + * module will cause it to chroot/setuid/etc. + * + * Instead of doing a transfer, the client may at this stage instead + * get a listing of remote modules and exit. + * + * @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; @@ -43,6 +57,7 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) extern int remote_version; extern int am_sender; extern char *shell_cmd; + extern int list_only; extern int kludge_around_eof; extern char *bind_address; extern int default_af_hint; @@ -80,6 +95,9 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) if (!user) user = getenv("LOGNAME"); 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); } @@ -101,10 +119,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; } @@ -115,10 +137,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; } @@ -129,7 +152,13 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) if (strcmp(line,"@RSYNCD: OK") == 0) break; - if (strcmp(line,"@RSYNCD: EXIT") == 0) exit(0); + if (strcmp(line,"@RSYNCD: EXIT") == 0) { + /* This is sent by recent versions of the + * server to terminate the listing of modules. + * We don't want to go on and transfer + * anything; just exit. */ + exit(0); + } if (strncmp(line, "@ERROR", 6) == 0) rprintf(FERROR,"%s\n", line); @@ -287,6 +316,7 @@ 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)) { @@ -294,6 +324,7 @@ static int rsync_module(int fd, int i) 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