Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fix redefinition of MAX
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
33e7b44
..
b8baa33
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-30,9
+30,11
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
int fd, i;
char *sargs[MAX_ARGS];
int sargc=0;
int fd, i;
char *sargs[MAX_ARGS];
int sargc=0;
- char line[
1024
];
+ char line[
MAXPATHLEN
];
char *p, *user=NULL;
extern int remote_version;
char *p, *user=NULL;
extern int remote_version;
+ extern int am_client;
+ extern int am_sender;
p = strchr(host, '@');
if (p) {
p = strchr(host, '@');
if (p) {
@@
-44,6
+46,8
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
if (!user) user = getenv("USER");
if (!user) user = getenv("LOGNAME");
if (!user) user = getenv("USER");
if (!user) user = getenv("LOGNAME");
+ am_client = 1;
+
fd = open_socket_out(host, rsync_port);
if (fd == -1) {
exit_cleanup(1);
fd = open_socket_out(host, rsync_port);
if (fd == -1) {
exit_cleanup(1);
@@
-92,6
+96,9
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
}
io_printf(fd,"\n");
}
io_printf(fd,"\n");
+ if (remote_version > 17 && !am_sender)
+ io_start_multiplex_in(fd);
+
return client_run(fd, fd, -1, argc, argv);
}
return client_run(fd, fd, -1, argc, argv);
}
@@
-102,15
+109,18
@@
static int rsync_module(int fd, int i)
int argc=0;
char *argv[MAX_ARGS];
char **argp;
int argc=0;
char *argv[MAX_ARGS];
char **argp;
- char line[
1024
];
- uid_t uid;
- gid_t gid;
+ char line[
MAXPATHLEN
];
+ uid_t uid
= (uid_t)-2
;
+ gid_t gid
= (gid_t)-2
;
char *p;
char *addr = client_addr(fd);
char *host = client_name(fd);
char *p;
char *addr = client_addr(fd);
char *host = client_name(fd);
- char *auth;
char *name = lp_name(i);
char *name = lp_name(i);
+ char *user;
int start_glob=0;
int start_glob=0;
+ char *request=NULL;
+ extern int am_sender;
+ extern int remote_version;
if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
rprintf(FERROR,"rsync denied on module %s from %s (%s)\n",
if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
rprintf(FERROR,"rsync denied on module %s from %s (%s)\n",
@@
-120,13
+130,6
@@
static int rsync_module(int fd, int i)
return -1;
}
return -1;
}
- if (!auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ")) {
- rprintf(FERROR,"auth failed on module %s from %s (%s)\n",
- name, client_name(fd), client_addr(fd));
- io_printf(fd,"@ERROR: auth failed on module %s\n",name);
- return -1;
- }
-
if (!claim_connection(lp_lock_file(), lp_max_connections())) {
rprintf(FERROR,"max connections (%d) reached\n",
lp_max_connections());
if (!claim_connection(lp_lock_file(), lp_max_connections())) {
rprintf(FERROR,"max connections (%d) reached\n",
lp_max_connections());
@@
-134,9
+137,16
@@
static int rsync_module(int fd, int i)
return -1;
}
return -1;
}
- rprintf(FINFO,"rsync on module %s from %s (%s)\n",
- name, host, addr);
+ user = auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ");
+
+ if (!user) {
+ rprintf(FERROR,"auth failed on module %s from %s (%s)\n",
+ name, client_name(fd), client_addr(fd));
+ io_printf(fd,"@ERROR: auth failed on module %s\n",name);
+ return -1;
+ }
+
module_id = i;
if (lp_read_only(i))
module_id = i;
if (lp_read_only(i))
@@
-165,25
+175,31
@@
static int rsync_module(int fd, int i)
p = lp_exclude_from(i);
add_exclude_file(p, 1);
p = lp_exclude_from(i);
add_exclude_file(p, 1);
- p = lp_exclude
_from
(i);
+ p = lp_exclude(i);
add_exclude_line(p);
add_exclude_line(p);
+ log_open();
+
if (chroot(lp_path(i))) {
if (chroot(lp_path(i))) {
+ rprintf(FERROR,"chroot %s failed\n", lp_path(i));
io_printf(fd,"@ERROR: chroot failed\n");
return -1;
}
if (chdir("/")) {
io_printf(fd,"@ERROR: chroot failed\n");
return -1;
}
if (chdir("/")) {
+ rprintf(FERROR,"chdir %s failed\n", lp_path(i));
io_printf(fd,"@ERROR: chdir failed\n");
return -1;
}
io_printf(fd,"@ERROR: chdir failed\n");
return -1;
}
- if (setgid(gid)) {
+ if (setgid(gid) || getgid() != gid) {
+ rprintf(FERROR,"setgid %d failed\n", gid);
io_printf(fd,"@ERROR: setgid failed\n");
return -1;
}
io_printf(fd,"@ERROR: setgid failed\n");
return -1;
}
- if (setuid(uid)) {
+ if (setuid(uid) || getuid() != uid) {
+ rprintf(FERROR,"setuid %d failed\n", uid);
io_printf(fd,"@ERROR: setuid failed\n");
return -1;
}
io_printf(fd,"@ERROR: setuid failed\n");
return -1;
}
@@
-201,18
+217,17
@@
static int rsync_module(int fd, int i)
p = line;
p = line;
- if (start_glob && strncmp(p, name, strlen(name)) == 0) {
- p += strlen(name);
- if (!*p) p = ".";
- }
-
argv[argc] = strdup(p);
if (!argv[argc]) {
return -1;
}
if (start_glob) {
argv[argc] = strdup(p);
if (!argv[argc]) {
return -1;
}
if (start_glob) {
- glob_expand(argv, &argc, MAX_ARGS);
+ if (start_glob == 1) {
+ request = strdup(p);
+ start_glob++;
+ }
+ glob_expand(name, argv, &argc, MAX_ARGS);
} else {
argc++;
}
} else {
argc++;
}
@@
-228,6
+243,19
@@
static int rsync_module(int fd, int i)
parse_arguments(argc, argv);
parse_arguments(argc, argv);
+ if (request) {
+ if (*user) {
+ rprintf(FINFO,"rsync %s %s from %s@%s (%s)\n",
+ am_sender?"on":"to",
+ request, user, host, addr);
+ } else {
+ rprintf(FINFO,"rsync %s %s from %s (%s)\n",
+ am_sender?"on":"to",
+ request, host, addr);
+ }
+ free(request);
+ }
+
/* don't allow the logs to be flooded too fast */
if (verbose > 1) verbose = 1;
/* don't allow the logs to be flooded too fast */
if (verbose > 1) verbose = 1;
@@
-235,6
+263,9
@@
static int rsync_module(int fd, int i)
argp = argv + optind;
optind = 0;
argp = argv + optind;
optind = 0;
+ if (remote_version > 17 && am_sender)
+ io_start_multiplex_out(fd);
+
start_server(fd, fd, argc, argp);
return 0;
start_server(fd, fd, argc, argp);
return 0;
@@
-263,11
+294,13
@@
static int start_daemon(int fd)
extern char *config_file;
extern int remote_version;
extern char *config_file;
extern int remote_version;
- if (!lp_load(config_file)) {
+ if (!lp_load(config_file
, 0
)) {
exit_cleanup(1);
}
set_socket_options(fd,"SO_KEEPALIVE");
exit_cleanup(1);
}
set_socket_options(fd,"SO_KEEPALIVE");
+ set_socket_options(fd,lp_socket_options());
+
io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
@@
-324,6
+357,8
@@
static int start_daemon(int fd)
int daemon_main(void)
{
int daemon_main(void)
{
+ extern char *config_file;
+
if (is_a_socket(STDIN_FILENO)) {
/* we are running via inetd */
return start_daemon(STDIN_FILENO);
if (is_a_socket(STDIN_FILENO)) {
/* we are running via inetd */
return start_daemon(STDIN_FILENO);
@@
-331,6
+366,15
@@
int daemon_main(void)
become_daemon();
become_daemon();
+ if (!lp_load(config_file, 1)) {
+ fprintf(stderr,"failed to load config file %s\n", config_file);
+ exit_cleanup(1);
+ }
+
+ log_open();
+
+ rprintf(FINFO,"rsyncd version %s starting\n",VERSION);
+
start_accept_loop(rsync_port, start_daemon);
return -1;
}
start_accept_loop(rsync_port, start_daemon);
return -1;
}