char *auth_user;
extern int sanitize_paths;
extern int filesfrom_fd;
+extern int remote_protocol;
+extern int protocol_version;
extern struct exclude_struct **server_exclude_list;
extern char *exclude_path_prefix;
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;
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);
}
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))) {
* 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);
}
if (am_root) {
-#ifdef HAVE_SETGROUPS
- /* Get rid of any supplementary groups this process
- * might have inheristed. */
- if (setgroups(0, NULL)) {
- rsyserr(FERROR, errno, "setgroups failed");
- io_printf(f_out, "@ERROR: setgroups failed\n");
- return -1;
- }
-#endif
-
/* XXXX: You could argue that if the daemon is started
* by a non-root user and they explicitly specify a
* gid, then we should try to change to that gid --
io_printf(f_out, "@ERROR: setgid failed\n");
return -1;
}
+#ifdef HAVE_SETGROUPS
+ /* Get rid of any supplementary groups this process
+ * might have inheristed. */
+ if (setgroups(1, &gid)) {
+ rsyserr(FERROR, errno, "setgroups failed");
+ io_printf(f_out, "@ERROR: setgroups failed\n");
+ return -1;
+ }
+#endif
if (setuid(uid)) {
rsyserr(FERROR, errno, "setuid %d failed", (int) uid);
if (verbose > 1) verbose = 1;
#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);
}
{
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 *motd;
int i = -1;
extern char *config_file;
- extern int remote_version;
extern int am_server;
if (!lp_load(config_file, 0)) {
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;