Make sure we call setgroups() after setuid(). (Ethan Benson)

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 1b3801b..6f3edfa 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -45,6 +45,7 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
        extern char *shell_cmd;
        extern int kludge_around_eof;
        extern char *bind_address;
+       extern int default_af_hint;
        
        if (argc == 0 && !am_sender) {
                extern int list_only;
@@ -78,8 +79,10 @@ 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,
-                                     global_opts.af_hint);
+                                     default_af_hint);
        if (fd == -1) {
                exit_cleanup(RERR_SOCKETIO);
        }
@@ -167,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;
        }
 
@@ -291,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);
        }
 
@@ -486,6 +499,7 @@ int daemon_main(void)
        extern char *config_file;
        extern int orig_umask;
        char *pid_file;
+       extern int no_detach;
 
        if (is_a_socket(STDIN_FILENO)) {
                int i;
@@ -501,7 +515,7 @@ int daemon_main(void)
                return start_daemon(STDIN_FILENO);
        }
 
-       if (!global_opts.no_detach)
+       if (!no_detach)
            become_daemon();
 
        if (!lp_load(config_file, 1)) {