change to allow names or numbers to be used for uid and gid.

[rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index b07654fa6665181154d2fcd8bd8f5aa4581d816c..95ca7b6c10c0ecf6ef71bcdb283982525dcbbe06 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -96,12 +96,33 @@ static int rsync_module(int fd, int i)
        char *argv[MAX_ARGS];
        char **argp;
        char line[1024];
+       uid_t uid;
+       gid_t gid;
+       char *p;
 
        module_id = i;
 
        if (lp_read_only(i))
                read_only = 1;
 
+       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);
+       }
+
        rprintf(FERROR,"rsyncd starting\n");
 
        if (chroot(lp_path(i))) {
@@ -114,12 +135,12 @@ static int rsync_module(int fd, int i)
                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;
        }
@@ -160,6 +181,8 @@ static int rsync_module(int fd, int i)
        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();
@@ -175,9 +198,10 @@ static void send_listing(int fd)
    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");
 
@@ -205,9 +229,7 @@ static int start_daemon(int fd)
                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)) {
@@ -230,17 +252,17 @@ static int start_daemon(int fd)
                        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);
        }
 
@@ -251,6 +273,7 @@ int daemon_main(void)
 
        become_daemon();
 
-       return start_accept_loop(rsync_port, start_daemon);
+       start_accept_loop(rsync_port, start_daemon);
+       return -1;
 }