/* -*- c-file-style: "linux"; -*-
- Copyright (C) 1998-2000 by Andrew Tridgell
+ 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
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* the socket based protocol for setting up a connection wit rsyncd */
+/* the socket based protocol for setting up a connection with rsyncd */
#include "rsync.h"
char *auth_user;
int sanitize_paths = 0;
+/*
+ * Run a client connected to an rsyncd. The alternative to this
+ * function for remote-shell connections is do_cmd.
+ */
int start_socket_client(char *host, char *path, int argc, char *argv[])
{
int fd, i;
extern int remote_version;
extern int am_sender;
extern struct in_addr socket_address;
+ extern char *shell_cmd;
if (argc == 0 && !am_sender) {
extern int list_only;
list_only = 1;
}
+ /* This is just a friendliness enhancement: if the connection
+ * is to an rsyncd then there is no point specifying the -e option.
+ * Note that this is only set if the -e was explicitly specified,
+ * not if the environment variable just happens to be set.
+ * See http://lists.samba.org/pipermail/rsync/2000-September/002744.html
+ */
+ if (shell_cmd) {
+ rprintf(FERROR, "WARNING: --rsh or -e option ignored when "
+ "connecting to rsync daemon\n");
+ /* continue */
+ }
+
if (*path == '/') {
- rprintf(FERROR,"ERROR: The remote path must start with a module name\n");
+ rprintf(FERROR,"ERROR: The remote path must start with a module name not a /\n");
return -1;
}
char *argv[MAX_ARGS];
char **argp;
char line[MAXPATHLEN];
- uid_t uid = (uid_t)-2;
+ uid_t uid = (uid_t)-2; /* canonically "nobody" */
gid_t gid = (gid_t)-2;
char *p;
char *addr = client_addr(fd);
if (!name_to_uid(p, &uid)) {
if (!isdigit(*p)) {
rprintf(FERROR,"Invalid uid %s\n", p);
- io_printf(fd,"@ERROR: invalid uid\n");
+ io_printf(fd,"@ERROR: invalid uid %s\n", p);
return -1;
}
uid = atoi(p);
if (!name_to_gid(p, &gid)) {
if (!isdigit(*p)) {
rprintf(FERROR,"Invalid gid %s\n", p);
- io_printf(fd,"@ERROR: invalid gid\n");
+ io_printf(fd,"@ERROR: invalid gid %s\n", p);
return -1;
}
gid = atoi(p);
}
}
+
+ /* TODO: If we're not root, but the configuration requests
+ * that we change to some uid other than the current one, then
+ * log a warning. */
+
+ /* TODO: Perhaps take a list of gids, and make them into the
+ * supplementary groups. */
p = lp_include_from(i);
add_exclude_file(p, 1, 1);
}
}
- ret = parse_arguments(argc, argv, 0);
+ argp = argv;
+ ret = parse_arguments(&argc, (const char ***) &argp, 0);
if (request) {
if (*auth_user) {
free(request);
}
-#if !TRIDGE
+#ifndef DEBUG
/* don't allow the logs to be flooded too fast */
if (verbose > 1) verbose = 1;
#endif
- argc -= optind;
- argp = argv + optind;
- optind = 0;
-
if (remote_version < 23) {
if (remote_version == 22 || (remote_version > 17 && am_sender))
io_start_multiplex_out(fd);
}
-
+
+ /* For later protocol versions, we don't start multiplexing
+ * until we've configured nonblocking in start_server. That
+ * means we're in a sticky situation now: there's no way to
+ * convey errors to the client. */
+
+ /* FIXME: Hold off on reporting option processing errors until
+ * we've set up nonblocking and multiplexed IO and can get the
+ * message back to them. */
if (!ret) {
- option_error();
+ option_error();
+ exit_cleanup(RERR_UNSUPPORTED);
}
if (lp_timeout(i)) {
log_init();
- rprintf(FINFO,"rsyncd version %s starting\n",VERSION);
+ rprintf(FINFO, "rsyncd version %s starting, listening on port %d\n", VERSION,
+ rsync_port);
+ /* TODO: If listening on a particular address, then show that
+ * address too. */
if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) {
char pidbuf[16];