X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/13e29995f5f08300ea946374079dff50f8cb6bd7..4f092bee9fd818de4248f420388bf2d6eacea987:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 73893764..6f3edfa9 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -79,6 +79,8 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
 	if (!user) user = getenv("USER");
 	if (!user) user = getenv("LOGNAME");
 
+	if (verbose >= 2) {
+	}
 	fd = open_socket_out_wrapped (host, rsync_port, bind_address,
 				      default_af_hint);
 	if (fd == -1) {
@@ -168,9 +170,9 @@ static int rsync_module(int fd, int i)
 
 	if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
 		rprintf(FERROR,"rsync denied on module %s from %s (%s)\n",
-			name, client_name(fd), client_addr(fd));
+			name, host, addr);
 		io_printf(fd,"@ERROR: access denied to %s from %s (%s)\n",
-			  name, client_name(fd), client_addr(fd));
+			  name, host, addr);
 		return -1;
 	}
 
@@ -292,6 +294,16 @@ 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);
 	}