extern int am_server;
extern int am_daemon;
extern int am_root;
-extern int module_id;
extern int verbose;
extern int rsync_port;
extern int kludge_around_eof;
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(module_id))
+ if (lp_read_only(i))
read_only = 1;
am_root = (MY_UID() == 0);
}
p = lp_filter(i);
- add_filter(&server_filter_list, p,
- XFLG_WORD_SPLIT | XFLG_ABS_PATH);
+ add_filter(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
+ XFLG_ANCHORED2ABS);
p = lp_include_from(i);
- add_filter_file(&server_filter_list, p,
- XFLG_FATAL_ERRORS | XFLG_ABS_PATH | XFLG_DEF_INCLUDE);
+ add_filter_file(&server_filter_list, p, MATCHFLG_INCLUDE,
+ XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_include(i);
add_filter(&server_filter_list, p,
- XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_INCLUDE);
+ MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT,
+ XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
p = lp_exclude_from(i);
- add_filter_file(&server_filter_list, p,
- XFLG_FATAL_ERRORS | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE);
+ add_filter_file(&server_filter_list, p, 0,
+ XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
p = lp_exclude(i);
- add_filter(&server_filter_list, p,
- XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE);
+ add_filter(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
+ XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
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)) {