Split out generic functions for starting rsyncd.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index a4e9e82..70c12e2 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -44,7 +44,8 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
        extern int am_sender;
        extern struct in_addr socket_address;
        extern char *shell_cmd;
-
+       extern int kludge_around_eof;
+       
        if (argc == 0 && !am_sender) {
                extern int list_only;
                list_only = 1;
@@ -63,7 +64,7 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
         }
         
        if (*path == '/') {
-               rprintf(FERROR,"ERROR: The remote path must start with a module name\n");
+               rprintf(FERROR,"ERROR: The remote path must start with a module name not a /\n");
                return -1;
        }
 
@@ -106,6 +107,10 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
        io_printf(fd,"%s\n",path);
        if (p) *p = '/';
 
+       /* Old servers may just drop the connection here,
+        rather than sending a proper EXIT command.  Yuck. */
+       kludge_around_eof = remote_version < 25;
+
        while (1) {
                if (!read_line(fd, line, sizeof(line)-1)) {
                        return -1;
@@ -117,8 +122,12 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
                }
 
                if (strcmp(line,"@RSYNCD: OK") == 0) break;
+
+               if (strcmp(line,"@RSYNCD: EXIT") == 0) exit(0);
+
                rprintf(FINFO,"%s\n", line);
        }
+       kludge_around_eof = False;
 
        for (i=0;i<sargc;i++) {
                io_printf(fd,"%s\n", sargs[i]);
@@ -196,7 +205,7 @@ static int rsync_module(int fd, int i)
                if (!name_to_uid(p, &uid)) {
                        if (!isdigit(*p)) {
                                rprintf(FERROR,"Invalid uid %s\n", p);
-                               io_printf(fd,"@ERROR: invalid uid\n");
+                               io_printf(fd,"@ERROR: invalid uid %s\n", p);
                                return -1;
                        } 
                        uid = atoi(p);
@@ -206,7 +215,7 @@ static int rsync_module(int fd, int i)
                if (!name_to_gid(p, &gid)) {
                        if (!isdigit(*p)) {
                                rprintf(FERROR,"Invalid gid %s\n", p);
-                               io_printf(fd,"@ERROR: invalid gid\n");
+                               io_printf(fd,"@ERROR: invalid gid %s\n", p);
                                return -1;
                        } 
                        gid = atoi(p);
@@ -258,13 +267,13 @@ static int rsync_module(int fd, int i)
 
        if (am_root) {
                if (setgid(gid)) {
-                       rsyserr(FERROR, errno, "setgid %d failed", gid);
+                       rsyserr(FERROR, errno, "setgid %d failed", (int) gid);
                        io_printf(fd,"@ERROR: setgid failed\n");
                        return -1;
                }
 
                if (setuid(uid)) {
-                       rsyserr(FERROR, errno, "setuid %d failed", uid);
+                       rsyserr(FERROR, errno, "setuid %d failed", (int) uid);
                        io_printf(fd,"@ERROR: setuid failed\n");
                        return -1;
                }
@@ -377,10 +386,14 @@ static void send_listing(int fd)
 {
        int n = lp_numservices();
        int i;
-       
+       extern int remote_version;
+
        for (i=0;i<n;i++)
                if (lp_list(i))
                    io_printf(fd, "%-15s\t%s\n", lp_name(i), lp_comment(i));
+
+       if (remote_version >= 25)
+               io_printf(fd,"@RSYNCD: EXIT\n");
 }
 
 /* this is called when a socket connection is established to a client
@@ -499,7 +512,7 @@ int daemon_main(void)
                    rsyserr(FLOG, errno, "failed to create pid file %s", pid_file);
                    exit_cleanup(RERR_FILEIO);
                }
-               slprintf(pidbuf, sizeof(pidbuf), "%d\n", pid);
+               snprintf(pidbuf, sizeof(pidbuf), "%d\n", pid);
                write(fd, pidbuf, strlen(pidbuf));
                close(fd);
        }