X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4f092bee9fd818de4248f420388bf2d6eacea987..0f0ea7f779623fc4cad2bbf8c955b32d37588127:/clientserver.c diff --git a/clientserver.c b/clientserver.c index 6f3edfa9..93a1eefb 100644 --- a/clientserver.c +++ b/clientserver.c @@ -129,7 +129,10 @@ int start_socket_client(char *host, char *path, int argc, char *argv[]) if (strcmp(line,"@RSYNCD: EXIT") == 0) exit(0); - rprintf(FINFO,"%s\n", line); + if (strncmp(line, "@ERROR", 6) == 0) + rprintf(FERROR,"%s\n", line); + else + rprintf(FINFO,"%s\n", line); } kludge_around_eof = False; @@ -282,6 +285,24 @@ static int rsync_module(int fd, int i) } if (am_root) { + /* Get rid of any supplementary groups this process + * might have inheristed. */ + if (setgroups(0, NULL)) { + rsyserr(FERROR, errno, "setgroups failed"); + io_printf(fd, "@ERROR: setgroups failed\n"); + return -1; + } + + /* 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 -- + * this could be possible if it's already in their + * supplementary groups. */ + + /* TODO: Perhaps we need to document that if rsyncd is + * started by somebody other than root it will inherit + * all their supplementary groups. */ + if (setgid(gid)) { rsyserr(FERROR, errno, "setgid %d failed", (int) gid); io_printf(fd,"@ERROR: setgid failed\n"); @@ -294,16 +315,6 @@ static int rsync_module(int fd, int i) return -1; } -#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(fd, "@ERROR: setgroups failed\n"); - return -1; - } -#endif - am_root = (getuid() == 0); }