#include "ifuncs.h"
extern int verbose;
+extern int dry_run;
extern int output_motd;
extern int list_only;
extern int am_sender;
extern int protocol_version;
extern int io_timeout;
extern int no_detach;
+extern int write_batch;
extern int default_af_hint;
extern int logfile_format_has_i;
extern int logfile_format_has_o_or_i;
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
int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char *argv[])
{
- int i;
+ int i, modlen;
char line[BIGPATHBUFLEN];
char *sargs[MAX_ARGS];
int sargc = 0;
- char *p, *path = *argv;
+ char *p, *modname;
- if (argc == 0 && !am_sender)
- list_only |= 1;
+ assert(argc > 0);
- if (*path == '/') {
+ if (**argv == '/') {
rprintf(FERROR,
"ERROR: The remote path must start with a module name\n");
return -1;
}
+ if (!(p = strchr(*argv, '/')))
+ modlen = strlen(*argv);
+ else
+ modlen = p - *argv;
+
+ if (!(modname = new_array(char, modlen+1+1))) /* room for '/' & '\0' */
+ out_of_memory("start_inband_exchange");
+ strlcpy(modname, *argv, modlen + 1);
+ modname[modlen] = '/';
+ modname[modlen+1] = '\0';
+
if (!user)
user = getenv("USER");
if (!user)
if (exchange_protocols(f_in, f_out, line, sizeof line, 1) < 0)
return -1;
- if (list_only && protocol_version >= 29)
- list_only |= 2;
-
/* set daemon_over_rsh to false since we need to build the
* true set of args passed through the rsh/ssh connection;
* this is a no-op for direct-socket-connection mode */
rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
exit_cleanup(RERR_SYNTAX);
}
- sargs[sargc++] = *argv++;
+ if (list_only && strncmp(*argv, modname, modlen) == 0
+ && argv[0][modlen] == '\0')
+ sargs[sargc++] = modname; /* we send "modname/" */
+ else
+ sargs[sargc++] = *argv;
+ argv++;
argc--;
}
if (verbose > 1)
print_child_argv("sending daemon args:", sargs);
- p = strchr(path, '/');
- if (p) *p = '\0';
- io_printf(f_out, "%s\n", path);
- if (p) *p = '/';
+ io_printf(f_out, "%.*s\n", modlen, modname);
/* Old servers may just drop the connection here,
rather than sending a proper EXIT command. Yuck. */
io_start_multiplex_in();
}
+ free(modname);
+
return 0;
}
char *bp = buf, *eob = buf + limit - 1;
while (1) {
- if (read(fd, bp, 1) != 1)
+ int got = read(fd, bp, 1);
+ if (got != 1) {
+ if (got < 0 && errno == EINTR)
+ continue;
return -1;
+ }
if (*bp == '\0')
break;
if (bp < eob)
sanitize_paths = 1;
}
+ if ((munge_symlinks = lp_munge_symlinks(i)) < 0)
+ munge_symlinks = !use_chroot;
+ if (munge_symlinks) {
+ STRUCT_STAT st;
+ if (stat(SYMLINK_PREFIX, &st) == 0 && S_ISDIR(st.st_mode)) {
+ rprintf(FLOG, "Symlink munging is unsupported when a %s directory exists.\n",
+ SYMLINK_PREFIX);
+ io_printf(f_out, "@ERROR: daemon security issue -- contact admin\n", name);
+ exit_cleanup(RERR_UNSUPPORTED);
+ }
+ }
+
if (am_root) {
/* XXXX: You could argue that if the daemon is started
* by a non-root user and they explicitly specify a
am_server = 1; /* Don't let someone try to be tricky. */
if (lp_ignore_errors(module_id))
ignore_errors = 1;
+ if (write_batch < 0)
+ dry_run = 1;
if (lp_fake_super(i))
am_root = -1;
return rsync_module(f_in, f_out, i, addr, host);
}
-static void create_pid_file(pid_t pid)
+static void create_pid_file(void)
{
char *pid_file = lp_pid_file();
char pidbuf[16];
+ pid_t pid = getpid();
int fd;
if (!pid_file || !*pid_file)
return;
cleanup_set_pid(pid);
- if ((fd = do_open(pid_file, O_WRONLY|O_CREAT|O_TRUNC, 0666 & ~orig_umask)) == -1) {
+ if ((fd = do_open(pid_file, O_WRONLY|O_CREAT|O_EXCL, 0666 & ~orig_umask)) == -1) {
cleanup_set_pid(0);
+ fprintf(stderr, "failed to create pid file %s: %s\n", pid_file, strerror(errno));
rsyserr(FLOG, errno, "failed to create pid file %s", pid_file);
exit_cleanup(RERR_FILEIO);
}
pid_t pid = fork();
if (pid) {
- create_pid_file(pid);
+ if (pid < 0) {
+ fprintf(stderr, "failed to fork: %s\n", strerror(errno));
+ exit_cleanup(RERR_FILEIO);
+ }
_exit(0);
}
+ create_pid_file();
+
/* detach from the terminal */
#ifdef HAVE_SETSID
setsid();
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;
}
if (no_detach)
- create_pid_file(getpid());
+ create_pid_file();
else
become_daemon();