/* -*- c-file-style: "linux"; -*-
-
- Copyright (C) 1998-2001 by Andrew Tridgell <tridge@samba.org>
- Copyright (C) 2001 by Martin Pool <mbp@samba.org>
-
- 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 <tridge@samba.org>
+ * Copyright (C) 2001-2002 by Martin Pool <mbp@samba.org>
+ *
+ * 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"
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().
+ * Either way, it eventually gets passed to exit_cleanup().
+ **/
int start_socket_client(char *host, char *path, int argc, char *argv[])
{
int fd, i;
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;
* See http://lists.samba.org/pipermail/rsync/2000-September/002744.html
*/
if (shell_cmd) {
- rprintf(FERROR, "WARNING: --rsh or -e option ignored when "
+ rprintf(FINFO, "WARNING: --rsh or -e option ignored when "
"connecting to rsync daemon\n");
/* continue */
}
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);
}
fd = open_socket_out_wrapped (host, rsync_port, bind_address,
default_af_hint);
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;
}
/* 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;
}
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)
+ if (strncmp(line, "@ERROR", 6) == 0) {
rprintf(FERROR,"%s\n", line);
- else
+ /* This is always fatal; the server will now
+ * close the socket. */
+ return RERR_STARTCLIENT;
+ } else {
rprintf(FINFO,"%s\n", line);
+ }
}
kludge_around_eof = False;
if (am_root) {
p = lp_uid(i);
if (!name_to_uid(p, &uid)) {
- if (!isdigit(*p)) {
+ if (!isdigit(* (unsigned char *) p)) {
rprintf(FERROR,"Invalid uid %s\n", p);
io_printf(fd,"@ERROR: invalid uid %s\n", p);
return -1;
p = lp_gid(i);
if (!name_to_gid(p, &gid)) {
- if (!isdigit(*p)) {
+ if (!isdigit(* (unsigned char *) p)) {
rprintf(FERROR,"Invalid gid %s\n", p);
io_printf(fd,"@ERROR: invalid gid %s\n", p);
return -1;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff