sargs[sargc] = NULL;
- p = strchr(path,'/');
- if (p) *p = 0;
- io_printf(fd,"%s\n",path);
- if (p) *p = '/';
-
if (!read_line(fd, line, sizeof(line)-1)) {
return -1;
}
return -1;
}
+ io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
+
+ p = strchr(path,'/');
+ if (p) *p = 0;
+ io_printf(fd,"%s\n",path);
+ if (p) *p = '/';
+
while (1) {
if (!read_line(fd, line, sizeof(line)-1)) {
return -1;
char *argv[MAX_ARGS];
char **argp;
char line[1024];
+ uid_t uid;
+ gid_t gid;
+ char *p;
+
+ rprintf(FINFO,"rsync on module %s from %s (%s)\n",
+ lp_name(i), client_name(fd), client_addr(fd));
module_id = i;
if (lp_read_only(i))
read_only = 1;
- rprintf(FERROR,"rsyncd starting\n");
+ p = lp_uid(i);
+ if (!name_to_uid(p, &uid)) {
+ if (!isdigit(*p)) {
+ rprintf(FERROR,"Invalid uid %s\n", p);
+ return -1;
+ }
+ uid = atoi(p);
+ }
+
+ p = lp_gid(i);
+ if (!name_to_gid(p, &gid)) {
+ if (!isdigit(*p)) {
+ rprintf(FERROR,"Invalid gid %s\n", p);
+ return -1;
+ }
+ gid = atoi(p);
+ }
if (chroot(lp_path(i))) {
io_printf(fd,"@ERROR: chroot failed\n");
return -1;
}
- if (setgid(lp_gid(i))) {
+ if (setgid(gid)) {
io_printf(fd,"@ERROR: setgid failed\n");
return -1;
}
- if (setuid(lp_uid(i))) {
+ if (setuid(uid)) {
io_printf(fd,"@ERROR: setuid failed\n");
return -1;
}
return 0;
}
+/* send a list of available modules to the client. Don't list those
+ with "list = False". */
static void send_listing(int fd)
{
int n = lp_numservices();
here */
static int start_daemon(int fd)
{
- char line[1024];
+ char line[200];
char *motd;
+ int version;
+ int i = -1;
set_socket_options(fd,"SO_KEEPALIVE");
io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
+ if (!read_line(fd, line, sizeof(line)-1)) {
+ return -1;
+ }
+
+ if (sscanf(line,"@RSYNCD: %d", &version) != 1) {
+ return -1;
+ }
+
motd = lp_motd_file();
if (*motd) {
FILE *f = fopen(motd,"r");
io_printf(fd,"\n");
}
- /* read a single line indicating the resource that is wanted */
- while (1) {
- int i;
+ while (i == -1) {
line[0] = 0;
if (!read_line(fd, line, sizeof(line)-1)) {
io_printf(fd,"ERROR: Unknown module '%s'\n", line);
return -1;
}
-
- return rsync_module(fd, i);
}
- return 0;
+ return rsync_module(fd, i);
}
int daemon_main(void)
{
- if (!lp_load(RSYNCD_CONF)) {
+ extern char *config_file;
+
+ if (!lp_load(config_file)) {
exit_cleanup(1);
}
become_daemon();
- return start_accept_loop(rsync_port, start_daemon);
+ start_accept_loop(rsync_port, start_daemon);
+ return -1;
}