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
fixed typo in rsyncd exclude handling
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
39e5b90
..
244bbc6
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-31,9
+31,19
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
char *sargs[MAX_ARGS];
int sargc=0;
char line[1024];
char *sargs[MAX_ARGS];
int sargc=0;
char line[1024];
- char *p;
+ char *p
, *user=NULL
;
extern int remote_version;
extern int remote_version;
+ p = strchr(host, '@');
+ if (p) {
+ user = host;
+ host = p+1;
+ *p = 0;
+ }
+
+ if (!user) user = getenv("USER");
+ if (!user) user = getenv("LOGNAME");
+
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);
@@
-67,6
+77,12
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
if (!read_line(fd, line, sizeof(line)-1)) {
return -1;
}
if (!read_line(fd, line, sizeof(line)-1)) {
return -1;
}
+
+ if (strncmp(line,"@RSYNCD: AUTHREQD ",18) == 0) {
+ auth_client(fd, user, line+18);
+ continue;
+ }
+
if (strcmp(line,"@RSYNCD: OK") == 0) break;
rprintf(FINFO,"%s\n", line);
}
if (strcmp(line,"@RSYNCD: OK") == 0) break;
rprintf(FINFO,"%s\n", line);
}
@@
-76,15
+92,6
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
}
io_printf(fd,"\n");
}
io_printf(fd,"\n");
-#if 0
- while (1) {
- if (!read_line(fd, line, sizeof(line)-1)) {
- return -1;
- }
- rprintf(FINFO,"%s\n", line);
- }
-#endif
-
return client_run(fd, fd, -1, argc, argv);
}
return client_run(fd, fd, -1, argc, argv);
}
@@
-101,21
+108,35
@@
static int rsync_module(int fd, int i)
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);
+ int start_glob=0;
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",
- lp_name(i), client_name(fd), client_addr(fd));
+ name, client_name(fd), client_addr(fd));
+ io_printf(fd,"@ERROR: access denied to %s from %s (%s)\n",
+ name, client_name(fd), client_addr(fd));
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())) {
if (!claim_connection(lp_lock_file(), lp_max_connections())) {
- rprintf(FERROR,"ERROR: max connections reached\n");
+ rprintf(FERROR,"max connections (%d) reached\n",
+ lp_max_connections());
+ io_printf(fd,"@ERROR: max connections (%d) reached - try again later\n", lp_max_connections());
return -1;
}
rprintf(FINFO,"rsync on module %s from %s (%s)\n",
return -1;
}
rprintf(FINFO,"rsync on module %s from %s (%s)\n",
-
lp_name(i)
, host, addr);
-
+
name
, host, addr);
+
module_id = i;
if (lp_read_only(i))
module_id = i;
if (lp_read_only(i))
@@
-125,6
+146,7
@@
static int rsync_module(int fd, int i)
if (!name_to_uid(p, &uid)) {
if (!isdigit(*p)) {
rprintf(FERROR,"Invalid uid %s\n", p);
if (!name_to_uid(p, &uid)) {
if (!isdigit(*p)) {
rprintf(FERROR,"Invalid uid %s\n", p);
+ io_printf(fd,"@ERROR: invalid uid\n");
return -1;
}
uid = atoi(p);
return -1;
}
uid = atoi(p);
@@
-134,11
+156,18
@@
static int rsync_module(int fd, int i)
if (!name_to_gid(p, &gid)) {
if (!isdigit(*p)) {
rprintf(FERROR,"Invalid gid %s\n", p);
if (!name_to_gid(p, &gid)) {
if (!isdigit(*p)) {
rprintf(FERROR,"Invalid gid %s\n", p);
+ io_printf(fd,"@ERROR: invalid gid\n");
return -1;
}
gid = atoi(p);
}
return -1;
}
gid = atoi(p);
}
+ p = lp_exclude_from(i);
+ add_exclude_file(p, 1);
+
+ p = lp_exclude(i);
+ add_exclude_line(p);
+
if (chroot(lp_path(i))) {
io_printf(fd,"@ERROR: chroot failed\n");
return -1;
if (chroot(lp_path(i))) {
io_printf(fd,"@ERROR: chroot failed\n");
return -1;
@@
-170,12
+199,28
@@
static int rsync_module(int fd, int i)
if (!*line) break;
if (!*line) break;
- argv[argc] = strdup(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 (!argv[argc]) {
return -1;
}
- argc++;
+ if (start_glob) {
+ glob_expand(argv, &argc, MAX_ARGS);
+ } else {
+ argc++;
+ }
+
+ if (strcmp(line,".") == 0) {
+ start_glob = 1;
+ }
+
if (argc == MAX_ARGS) {
return -1;
}
if (argc == MAX_ARGS) {
return -1;
}
@@
-245,11
+290,11
@@
static int start_daemon(int fd)
}
if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) {
}
if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) {
+ io_printf(fd,"@ERROR: protocol startup error\n");
return -1;
}
while (i == -1) {
return -1;
}
while (i == -1) {
-
line[0] = 0;
if (!read_line(fd, line, sizeof(line)-1)) {
return -1;
line[0] = 0;
if (!read_line(fd, line, sizeof(line)-1)) {
return -1;
@@
-262,13
+307,13
@@
static int start_daemon(int fd)
if (*line == '#') {
/* it's some sort of command that I don't understand */
if (*line == '#') {
/* it's some sort of command that I don't understand */
- io_printf(fd,"ERROR: Unknown command '%s'\n", line);
+ io_printf(fd,"
@
ERROR: Unknown command '%s'\n", line);
return -1;
}
i = lp_number(line);
if (i == -1) {
return -1;
}
i = lp_number(line);
if (i == -1) {
- io_printf(fd,"ERROR: Unknown module '%s'\n", line);
+ io_printf(fd,"
@
ERROR: Unknown module '%s'\n", line);
return -1;
}
}
return -1;
}
}