extern int am_server;
extern int am_daemon;
extern int am_root;
-extern int module_id;
-extern int read_only;
extern int verbose;
extern int rsync_port;
extern int kludge_around_eof;
extern int no_detach;
extern int default_af_hint;
extern char *bind_address;
-extern struct exclude_list_struct server_exclude_list;
+extern struct filter_list_struct server_filter_list;
extern char *config_file;
extern char *files_from;
char *auth_user;
+int read_only = 0;
+int module_id = -1;
/* Length of lp_path() string when in daemon mode & not chrooted, else 0. */
unsigned int module_dirlen = 0;
} else {
rprintf(FLOG, "max connections (%d) reached\n",
lp_max_connections(i));
- io_printf(f_out, "@ERROR: max connections (%d) reached - try again later\n",
+ io_printf(f_out, "@ERROR: max connections (%d) reached -- try again later\n",
lp_max_connections(i));
}
return -1;
module_id = i;
+ if (lp_read_only(i))
+ read_only = 1;
+
am_root = (MY_UID() == 0);
if (am_root) {
if (use_chroot) {
module_dirlen = 0;
- set_excludes_dir("/", 1);
+ set_filter_dir("/", 1);
} else {
module_dirlen = strlen(lp_path(i));
- set_excludes_dir(lp_path(i), module_dirlen);
+ set_filter_dir(lp_path(i), module_dirlen);
}
p = lp_filter(i);
- add_exclude(&server_exclude_list, p,
- XFLG_WORD_SPLIT | XFLG_ABS_PATH);
+ add_filter(&server_filter_list, p,
+ XFLG_WORD_SPLIT | XFLG_ANCHORED2ABS);
p = lp_include_from(i);
- add_exclude_file(&server_exclude_list, p,
- XFLG_FATAL_ERRORS | XFLG_ABS_PATH | XFLG_DEF_INCLUDE);
+ add_filter_file(&server_filter_list, p,
+ XFLG_FATAL_ERRORS | XFLG_ANCHORED2ABS | XFLG_DEF_INCLUDE);
p = lp_include(i);
- add_exclude(&server_exclude_list, p,
- XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_INCLUDE);
+ add_filter(&server_filter_list, p,
+ XFLG_WORD_SPLIT | XFLG_ANCHORED2ABS | XFLG_DEF_INCLUDE);
p = lp_exclude_from(i);
- add_exclude_file(&server_exclude_list, p,
- XFLG_FATAL_ERRORS | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE);
+ add_filter_file(&server_filter_list, p,
+ XFLG_FATAL_ERRORS | XFLG_ANCHORED2ABS | XFLG_DEF_EXCLUDE);
p = lp_exclude(i);
- add_exclude(&server_exclude_list, p,
- XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE);
+ add_filter(&server_filter_list, p,
+ XFLG_WORD_SPLIT | XFLG_ANCHORED2ABS | XFLG_DEF_EXCLUDE);
log_init();
io_printf(f_out, "@ERROR: setgid failed\n");
return -1;
}
-#ifdef HAVE_SETGROUPS
+#if HAVE_SETGROUPS
/* Get rid of any supplementary groups this process
* might have inheristed. */
if (setgroups(1, &gid)) {
start_glob = 1;
}
+ verbose = 0; /* future verbosity is controlled by client options */
argp = argv;
ret = parse_arguments(&argc, (const char ***) &argp, 0);