*
* 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
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);
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();
exit_cleanup(RERR_UNSUPPORTED);
}
+#ifdef ICONV_OPTION
if (!iconv_opt) {
if (ic_send != (iconv_t)-1) {
iconv_close(ic_send);
ic_recv = (iconv_t)-1;
}
}
+#endif
if (!numeric_ids
&& (use_chroot ? lp_numeric_ids(i) != False : lp_numeric_ids(i) == True))
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 */
* 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);
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;
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);
}