The --fake-super option conflicts with -XX (which copies internal

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 2d7c28f..6bcbc81 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
  * Copyright (C) 2001-2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2002-2007 Wayne Davison
+ * Copyright (C) 2002-2008 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
@@ -32,6 +32,7 @@ extern int am_daemon;
 extern int am_root;
 extern int rsync_port;
 extern int ignore_errors;
+extern int preserve_xattrs;
 extern int kluge_around_eof;
 extern int daemon_over_rsh;
 extern int sanitize_paths;
@@ -120,6 +121,10 @@ int start_socket_client(char *host, int remote_argc, char *remote_argv[],
 
        set_socket_options(fd, sockopts);
 
+#ifdef ICONV_CONST
+       setup_iconv();
+#endif
+
        ret = start_inband_exchange(fd, fd, user, remote_argc, remote_argv);
 
        return ret ? ret : client_run(fd, fd, -1, argc, argv);
@@ -391,7 +396,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
        pid_t pre_exec_pid = 0;
        char *request = NULL;
 
-#ifdef ICONV_CONST
+#ifdef ICONV_OPTION
        iconv_opt = lp_charset(i);
        if (*iconv_opt)
                setup_iconv();
@@ -741,9 +746,11 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
        if (write_batch < 0)
                dry_run = 1;
 
-       if (lp_fake_super(i))
+       if (lp_fake_super(i)) {
+               if (preserve_xattrs > 1)
+                       preserve_xattrs = 1;
                am_root = -1;
-       else if (am_root < 0) /* Treat --fake-super from client as --super. */
+       } else if (am_root < 0) /* Treat --fake-super from client as --super. */
                am_root = 2;
 
        if (filesfrom_fd == 0)
@@ -806,6 +813,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
                exit_cleanup(RERR_UNSUPPORTED);
        }
 
+#ifdef ICONV_OPTION
        if (!iconv_opt) {
                if (ic_send != (iconv_t)-1) {
                        iconv_close(ic_send);
@@ -816,6 +824,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
                        ic_recv = (iconv_t)-1;
                }
        }
+#endif
 
        if (!numeric_ids
         && (use_chroot ? lp_numeric_ids(i) != False : lp_numeric_ids(i) == True))
@@ -858,6 +867,17 @@ static void send_listing(int fd)
                io_printf(fd,"@RSYNCD: EXIT\n");
 }
 
+static int load_config(int globals_only)
+{
+       if (!config_file) {
+               if (am_server && am_root <= 0)
+                       config_file = RSYNCD_USERCONF;
+               else
+                       config_file = RSYNCD_SYSCONF;
+       }
+       return lp_load(config_file, globals_only);
+}
+
 /* this is called when a connection is established to a client
    and we want to start talking. The setup of the system is done from
    here */
@@ -873,7 +893,7 @@ int start_daemon(int f_in, int f_out)
         * might cause log-file output to occur.  This ensures that the
         * "log file" param gets honored for the 2 non-forked use-cases
         * (when rsync is run by init and run by a remote shell). */
-       if (!lp_load(config_file, 0))
+       if (!load_config(0))
                exit_cleanup(RERR_SYNTAX);
 
        addr = client_addr(f_in);
@@ -982,13 +1002,6 @@ static void become_daemon(void)
 
 int daemon_main(void)
 {
-       if (!config_file) {
-               if (am_server && am_root <= 0)
-                       config_file = RSYNCD_USERCONF;
-               else
-                       config_file = RSYNCD_SYSCONF;
-       }
-
        if (is_a_socket(STDIN_FILENO)) {
                int i;
 
@@ -1003,7 +1016,7 @@ int daemon_main(void)
                return start_daemon(STDIN_FILENO, STDIN_FILENO);
        }
 
-       if (!lp_load(config_file, 1)) {
+       if (!load_config(1)) {
                fprintf(stderr, "Failed to parse config file: %s\n", config_file);
                exit_cleanup(RERR_SYNTAX);
        }