#include "rsync.h"
+extern int am_sender;
+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;
-char *auth_user;
+extern int kludge_around_eof;
+extern int daemon_over_rsh;
+extern int list_only;
extern int sanitize_paths;
extern int filesfrom_fd;
+extern int remote_protocol;
+extern int protocol_version;
+extern int io_timeout;
+extern int orig_umask;
+extern int no_detach;
+extern int default_af_hint;
+extern char *bind_address;
extern struct exclude_struct **server_exclude_list;
extern char *exclude_path_prefix;
+extern char *config_file;
+
+char *auth_user;
/**
* Run a client connected to an rsyncd. The alternative to this
{
int fd, ret;
char *p, *user=NULL;
- extern char *bind_address;
- extern int default_af_hint;
/* this is redundant with code in start_inband_exchange(), but
* this short-circuits a problem before we open a socket, and
int sargc = 0;
char line[MAXPATHLEN];
char *p;
- extern int remote_version;
- extern int kludge_around_eof;
- extern int am_sender;
- extern int daemon_over_rsh;
- extern int list_only;
if (argc == 0 && !am_sender)
list_only = 1;
sargs[sargc] = NULL;
- io_printf(f_out, "@RSYNCD: %d\n", PROTOCOL_VERSION);
+ io_printf(f_out, "@RSYNCD: %d\n", protocol_version);
if (!read_line(f_in, line, sizeof(line)-1)) {
rprintf(FERROR, "rsync: did not see server greeting\n");
return -1;
}
- if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) {
+ if (sscanf(line,"@RSYNCD: %d", &remote_protocol) != 1) {
/* note that read_line strips of \n or \r */
rprintf(FERROR, "rsync: server sent \"%s\" rather than greeting\n",
line);
return -1;
}
+ if (protocol_version > remote_protocol)
+ protocol_version = remote_protocol;
p = strchr(path,'/');
if (p) *p = 0;
/* Old servers may just drop the connection here,
rather than sending a proper EXIT command. Yuck. */
- kludge_around_eof = list_only && (remote_version < 25);
+ kludge_around_eof = list_only && (protocol_version < 25);
while (1) {
if (!read_line(f_in, line, sizeof(line)-1)) {
}
io_printf(f_out, "\n");
- if (remote_version < 23) {
- if (remote_version == 22 || (remote_version > 17 && !am_sender))
+ if (protocol_version < 23) {
+ if (protocol_version == 22 || !am_sender)
io_start_multiplex_in(f_in);
}
int start_glob=0;
int ret;
char *request=NULL;
- extern int am_sender;
- extern int am_server;
- extern int am_daemon;
- extern int remote_version;
- extern int am_root;
if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
rprintf(FERROR,"rsync denied on module %s from %s (%s)\n",
module_id = i;
- am_root = (getuid() == 0);
+ am_root = (MY_UID() == 0);
if (am_root) {
p = lp_uid(i);
* supplementary groups. */
exclude_path_prefix = use_chroot? "" : lp_path(i);
+ if (*exclude_path_prefix == '/' && !exclude_path_prefix[1])
+ exclude_path_prefix = "";
p = lp_include_from(i);
- add_exclude_file(&server_exclude_list, p, MISSING_FATAL, ADD_INCLUDE);
+ add_exclude_file(&server_exclude_list, p,
+ XFLG_FATAL_ERRORS | XFLG_DEF_INCLUDE);
p = lp_include(i);
- add_exclude_line(&server_exclude_list, p, ADD_INCLUDE);
+ add_exclude(&server_exclude_list, p,
+ XFLG_WORD_SPLIT | XFLG_DEF_INCLUDE);
p = lp_exclude_from(i);
- add_exclude_file(&server_exclude_list, p, MISSING_FATAL, ADD_EXCLUDE);
+ add_exclude_file(&server_exclude_list, p,
+ XFLG_FATAL_ERRORS);
p = lp_exclude(i);
- add_exclude_line(&server_exclude_list, p, ADD_EXCLUDE);
+ add_exclude(&server_exclude_list, p, XFLG_WORD_SPLIT);
exclude_path_prefix = NULL;
return -1;
}
- if (!push_dir("/", 0)) {
+ if (!push_dir("/")) {
rsyserr(FERROR, errno, "chdir %s failed\n", lp_path(i));
io_printf(f_out, "@ERROR: chdir failed\n");
return -1;
}
} else {
- if (!push_dir(lp_path(i), 0)) {
+ if (!push_dir(lp_path(i))) {
rsyserr(FERROR, errno, "chdir %s failed\n", lp_path(i));
io_printf(f_out, "@ERROR: chdir failed\n");
return -1;
return -1;
}
- am_root = (getuid() == 0);
+ am_root = (MY_UID() == 0);
}
io_printf(f_out, "@RSYNCD: OK\n");
}
}
- if (sanitize_paths) {
- /*
- * Note that this is applied to all parameters, whether or not
- * they are filenames, but no other legal parameters contain
- * the forms that need to be sanitized so it doesn't hurt;
- * it is not known at this point which parameters are files
- * and which aren't.
- */
- for (i = 1; i < argc; i++) {
- sanitize_path(argv[i], NULL);
- }
- }
-
argp = argv;
ret = parse_arguments(&argc, (const char ***) &argp, 0);
#ifndef DEBUG
/* don't allow the logs to be flooded too fast */
- if (verbose > 1) verbose = 1;
+ if (verbose > lp_max_verbosity())
+ verbose = lp_max_verbosity();
#endif
- if (remote_version < 23) {
- if (remote_version == 22 || (remote_version > 17 && am_sender))
+ if (protocol_version < 23) {
+ if (protocol_version == 22 || am_sender)
io_start_multiplex_out(f_out);
}
}
if (lp_timeout(i)) {
- extern int io_timeout;
io_timeout = lp_timeout(i);
}
{
int n = lp_numservices();
int i;
- extern int remote_version;
for (i=0;i<n;i++)
if (lp_list(i))
io_printf(fd, "%-15s\t%s\n", lp_name(i), lp_comment(i));
- if (remote_version >= 25)
+ if (protocol_version >= 25)
io_printf(fd,"@RSYNCD: EXIT\n");
}
char line[200];
char *motd;
int i = -1;
- extern char *config_file;
- extern int remote_version;
- extern int am_server;
if (!lp_load(config_file, 0)) {
exit_cleanup(RERR_SYNTAX);
set_nonblocking(f_in);
}
- io_printf(f_out, "@RSYNCD: %d\n", PROTOCOL_VERSION);
+ io_printf(f_out, "@RSYNCD: %d\n", protocol_version);
motd = lp_motd_file();
if (motd && *motd) {
return -1;
}
- if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) {
+ if (sscanf(line,"@RSYNCD: %d", &remote_protocol) != 1) {
io_printf(f_out, "@ERROR: protocol startup error\n");
return -1;
}
+ if (protocol_version > remote_protocol)
+ protocol_version = remote_protocol;
while (i == -1) {
line[0] = 0;
int daemon_main(void)
{
- extern char *config_file;
- extern int orig_umask;
char *pid_file;
- extern int no_detach;
if (is_a_socket(STDIN_FILENO)) {
int i;
if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) {
char pidbuf[16];
int fd;
- int pid = (int) getpid();
+ pid_t pid = getpid();
cleanup_set_pid(pid);
if ((fd = do_open(lp_pid_file(), O_WRONLY|O_CREAT|O_TRUNC,
0666 & ~orig_umask)) == -1) {
rsyserr(FLOG, errno, "failed to create pid file %s", pid_file);
exit_cleanup(RERR_FILEIO);
}
- snprintf(pidbuf, sizeof(pidbuf), "%d\n", pid);
+ snprintf(pidbuf, sizeof pidbuf, "%ld\n", (long)pid);
write(fd, pidbuf, strlen(pidbuf));
close(fd);
}