Split up the ifuncs.h file into 3 .h files.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index f78c61c..ba9b150 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -20,10 +20,9 @@
  */
 
 #include "rsync.h"
-#include "ifuncs.h"
+#include "itypes.h"
 
 extern int quiet;
-extern int verbose;
 extern int dry_run;
 extern int output_motd;
 extern int list_only;
@@ -37,6 +36,7 @@ extern int ignore_errors;
 extern int preserve_xattrs;
 extern int kluge_around_eof;
 extern int daemon_over_rsh;
+extern int munge_symlinks;
 extern int sanitize_paths;
 extern int numeric_ids;
 extern int filesfrom_fd;
@@ -50,14 +50,13 @@ extern int logfile_format_has_i;
 extern int logfile_format_has_o_or_i;
 extern mode_t orig_umask;
 extern char *bind_address;
-extern char *sockopts;
 extern char *config_file;
 extern char *logfile_format;
 extern char *files_from;
 extern char *tmpdir;
 extern struct chmod_mode_struct *chmod_modes;
 extern struct filter_list_struct daemon_filter_list;
-extern char curr_dir[];
+extern char curr_dir[MAXPATHLEN];
 #ifdef ICONV_OPTION
 extern char *iconv_opt;
 extern iconv_t ic_send, ic_recv;
@@ -66,7 +65,6 @@ extern iconv_t ic_send, ic_recv;
 char *auth_user;
 int read_only = 0;
 int module_id = -1;
-int munge_symlinks = 0;
 struct chmod_mode_struct *daemon_chmod_modes;
 
 /* module_dirlen is the length of the module_dir string when in daemon
@@ -267,7 +265,7 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
 
        sargs[sargc] = NULL;
 
-       if (verbose > 1)
+       if (DEBUG_GTE(CMD, 1))
                print_child_argv("sending daemon args:", sargs);
 
        io_printf(f_out, "%.*s\n", modlen, modname);
@@ -406,6 +404,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
        char *name = lp_name(i);
        int use_chroot = lp_use_chroot(i);
        int ret, pre_exec_fd = -1;
+       int save_munge_symlinks;
        pid_t pre_exec_pid = 0;
        char *request = NULL;
 
@@ -689,9 +688,11 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
                munge_symlinks = !use_chroot || module_dirlen;
        if (munge_symlinks) {
                STRUCT_STAT st;
-               if (do_stat(SYMLINK_PREFIX, &st) == 0 && S_ISDIR(st.st_mode)) {
-                       rprintf(FLOG, "Symlink munging is unsupported when a %s directory exists.\n",
-                               SYMLINK_PREFIX);
+               char prefix[SYMLINK_PREFIX_LEN]; /* NOT +1 ! */
+               strlcpy(prefix, SYMLINK_PREFIX, sizeof prefix); /* trim the trailing slash */
+               if (do_stat(prefix, &st) == 0 && S_ISDIR(st.st_mode)) {
+                       rprintf(FLOG, "Symlink munging is unsafe when a %s directory exists.\n",
+                               prefix);
                        io_printf(f_out, "@ERROR: daemon security issue -- contact admin\n", name);
                        exit_cleanup(RERR_UNSUPPORTED);
                }
@@ -747,7 +748,9 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
        read_args(f_in, name, line, sizeof line, rl_nulls, &argv, &argc, &request);
        orig_argv = argv;
 
-       verbose = 0; /* future verbosity is controlled by client options */
+       save_munge_symlinks = munge_symlinks;
+
+       reset_output_levels(); /* future verbosity is controlled by client options */
        ret = parse_arguments(&argc, (const char ***) &argv);
        if (protect_args && ret) {
                orig_early_argv = orig_argv;
@@ -758,6 +761,8 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
        } else
                orig_early_argv = NULL;
 
+       munge_symlinks = save_munge_symlinks; /* The client mustn't control this. */
+
        if (pre_exec_pid) {
                err_msg = finish_pre_exec(pre_exec_pid, pre_exec_fd, request,
                                          orig_early_argv, orig_argv);
@@ -798,8 +803,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
 
 #ifndef DEBUG
        /* don't allow the logs to be flooded too fast */
-       if (verbose > lp_max_verbosity(i))
-               verbose = lp_max_verbosity(i);
+       limit_output_verbosity(lp_max_verbosity(i));
 #endif
 
        if (protocol_version < 23
@@ -882,7 +886,7 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
    with "list = False". */
 static void send_listing(int fd)
 {
-       int n = lp_numservices();
+       int n = lp_num_modules();
        int i;
 
        for (i = 0; i < n; i++) {
@@ -1043,6 +1047,7 @@ int daemon_main(void)
                fprintf(stderr, "Failed to parse config file: %s\n", config_file);
                exit_cleanup(RERR_SYNTAX);
        }
+       set_dparams(0);
 
        if (no_detach)
                create_pid_file();