Add some brief notes on how to install.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 914d642..044f86d 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -1,6 +1,7 @@
 /* -*- 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
@@ -17,7 +18,7 @@
    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"
 
@@ -28,6 +29,10 @@ extern int rsync_port;
 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;
@@ -38,12 +43,25 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
        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");
                return -1;
@@ -297,7 +315,8 @@ static int rsync_module(int fd, int i)
                }
        }
 
-       ret = parse_arguments(argc, argv, 0);
+        argp = argv;
+       ret = parse_arguments(&argc, (const char ***) &argp, 0);
 
        if (request) {
                if (*auth_user) {
@@ -312,22 +331,27 @@ static int rsync_module(int fd, int i)
                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)) {
@@ -452,7 +476,10 @@ int daemon_main(void)
 
        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];