Make option variables a little clearer by using separate FOO_ndx

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index fdd19cc..e557309 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -625,11 +625,15 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
 
        verbose = 0; /* future verbosity is controlled by client options */
        ret = parse_arguments(&argc, (const char ***) &argv, 0);
-       quiet = 0; /* Don't let someone try to be tricky. */
-       am_server = 1; /* ditto */
+       am_server = 1; /* Don't let someone try to be tricky. */
        if (lp_ignore_errors(module_id))
                ignore_errors = 1;
 
+       if (lp_fake_super(i))
+               am_root = -1;
+       else if (am_root < 0) /* Treat --fake-super from client as --super. */
+               am_root = 2;
+
        if (filesfrom_fd == 0)
                filesfrom_fd = f_in;
 
@@ -683,7 +687,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
 
        if (!ret || err_msg) {
                if (err_msg)
-                       rwrite(FERROR, err_msg, strlen(err_msg));
+                       rwrite(FERROR, err_msg, strlen(err_msg), 0);
                else
                        option_error();
                msleep(400);