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 0f92451..e557309 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -3,12 +3,11 @@
  *
  * Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
  * Copyright (C) 2001-2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2002, 2003, 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2002-2007 Wayne Davison
  *
  * 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.
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -626,10 +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; /* 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);