Changed wait_process() into a simpler, yet more versatile function,

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 4f8c3e2..e069267 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -48,6 +48,7 @@ extern char *bind_address;
 extern struct filter_list_struct server_filter_list;
 extern char *config_file;
 extern char *files_from;
+extern char *tmpdir;
 
 char *auth_user;
 int read_only = 0;
@@ -108,7 +109,7 @@ int start_inband_exchange(char *user, char *path, int f_in, int f_out,
        int i;
        char *sargs[MAX_ARGS];
        int sargc = 0;
-       char line[MAXPATHLEN];
+       char line[BIGPATHBUFLEN];
        char *p;
 
        if (argc == 0 && !am_sender)
@@ -222,11 +223,13 @@ static int rsync_module(int f_in, int f_out, int i)
        int argc = 0;
        int maxargs;
        char **argv;
-       char **argp;
-       char line[MAXPATHLEN];
+       char line[BIGPATHBUFLEN];
        uid_t uid = (uid_t)-2;  /* canonically "nobody" */
        gid_t gid = (gid_t)-2;
        char *p;
+#ifdef HAVE_PUTENV
+       char *s;
+#endif
        char *addr = client_addr(f_in);
        char *host = client_name(f_in);
        char *name = lp_name(i);
@@ -326,27 +329,79 @@ static int rsync_module(int f_in, int f_out, int i)
 
        p = lp_filter(i);
        parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
-                  XFLG_ANCHORED2ABS);
+                  XFLG_ABS_IF_SLASH);
 
        p = lp_include_from(i);
        parse_filter_file(&server_filter_list, p, MATCHFLG_INCLUDE,
-           XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
+           XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
 
        p = lp_include(i);
        parse_rule(&server_filter_list, p,
                   MATCHFLG_INCLUDE | MATCHFLG_WORD_SPLIT,
-                  XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
+                  XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
 
        p = lp_exclude_from(i);
        parse_filter_file(&server_filter_list, p, 0,
-           XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
+           XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES | XFLG_FATAL_ERRORS);
 
        p = lp_exclude(i);
        parse_rule(&server_filter_list, p, MATCHFLG_WORD_SPLIT,
-                  XFLG_ANCHORED2ABS | XFLG_OLD_PREFIXES);
+                  XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
 
        log_init();
 
+#ifdef HAVE_PUTENV
+       s = lp_prexfer_exec(i);
+       p = lp_postxfer_exec(i);
+       if ((s && *s) || (p && *p)) {
+               char *modname, *modpath, *hostaddr, *hostname, *username;
+               int status;
+               if (asprintf(&modname, "RSYNC_MODULE_NAME=%s", name) < 0
+                || asprintf(&modpath, "RSYNC_MODULE_PATH=%s", lp_path(i)) < 0
+                || asprintf(&hostaddr, "RSYNC_HOST_ADDR=%s", addr) < 0
+                || asprintf(&hostname, "RSYNC_HOST_NAME=%s", host) < 0
+                || asprintf(&username, "RSYNC_USER_NAME=%s", auth_user) < 0)
+                       out_of_memory("rsync_module");
+               putenv(modname);
+               putenv(modpath);
+               putenv(hostaddr);
+               putenv(hostname);
+               putenv(username);
+               umask(orig_umask);
+               if (s && *s) {
+                       status = system(s);
+                       if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+                               rprintf(FLOG, "prexfer-exec failed\n");
+                               io_printf(f_out, "@ERROR: prexfer-exec failed\n");
+                               return -1;
+                       }
+               }
+               if (p && *p) {
+                       pid_t pid = fork();
+                       if (pid < 0) {
+                               rsyserr(FLOG, errno, "fork failed");
+                               io_printf(f_out, "@ERROR: fork failed\n");
+                               return -1;
+                       }
+                       if (pid) {
+                               char *ret1, *ret2;
+                               waitpid(pid, &status, 0);
+                               if (asprintf(&ret1, "RSYNC_RAW_STATUS=%d", status) > 0)
+                                       putenv(ret1);
+                               if (WIFEXITED(status))
+                                       status = WEXITSTATUS(status);
+                               else
+                                       status = -1;
+                               if (asprintf(&ret2, "RSYNC_EXIT_STATUS=%d", status) > 0)
+                                       putenv(ret2);
+                               system(p);
+                               _exit(status);
+                       }
+               }
+               umask(0);
+       }
+#endif
+
        if (use_chroot) {
                /*
                 * XXX: The 'use chroot' flag is a fairly reliable
@@ -419,6 +474,16 @@ static int rsync_module(int f_in, int f_out, int i)
                am_root = (MY_UID() == 0);
        }
 
+       if (lp_temp_dir(i) && *lp_temp_dir(i)) {
+               tmpdir = lp_temp_dir(i);
+               if (strlen(tmpdir) >= MAXPATHLEN - 10) {
+                       rprintf(FLOG,
+                               "the 'temp dir' value for %s is WAY too long -- ignoring.\n",
+                               name);
+                       tmpdir = NULL;
+               }
+       }
+
        io_printf(f_out, "@RSYNCD: OK\n");
 
        maxargs = MAX_ARGS;
@@ -443,22 +508,24 @@ static int rsync_module(int f_in, int f_out, int i)
                if (!(argv[argc] = strdup(p)))
                        out_of_memory("rsync_module");
 
-               if (start_glob) {
-                       if (start_glob == 1) {
-                               request = strdup(p);
-                               start_glob++;
-                       }
-                       glob_expand(name, &argv, &argc, &maxargs);
-               } else
+               switch (start_glob) {
+               case 0:
                        argc++;
-
-               if (strcmp(line, ".") == 0)
-                       start_glob = 1;
+                       if (strcmp(line, ".") == 0)
+                               start_glob = 1;
+                       break;
+               case 1:
+                       request = strdup(p);
+                       start_glob = 2;
+                       /* FALL THROUGH */
+               default:
+                       glob_expand(name, &argv, &argc, &maxargs);
+                       break;
+               }
        }
 
        verbose = 0; /* future verbosity is controlled by client options */
-       argp = argv;
-       ret = parse_arguments(&argc, (const char ***) &argp, 0);
+       ret = parse_arguments(&argc, (const char ***) &argv, 0);
 
        if (filesfrom_fd == 0)
                filesfrom_fd = f_in;
@@ -478,8 +545,8 @@ static int rsync_module(int f_in, int f_out, int i)
 
 #ifndef DEBUG
        /* don't allow the logs to be flooded too fast */
-       if (verbose > lp_max_verbosity())
-               verbose = lp_max_verbosity();
+       if (verbose > lp_max_verbosity(i))
+               verbose = lp_max_verbosity(i);
 #endif
 
        if (protocol_version < 23
@@ -520,7 +587,7 @@ static int rsync_module(int f_in, int f_out, int i)
        if (lp_timeout(i) && lp_timeout(i) > io_timeout)
                set_io_timeout(lp_timeout(i));
 
-       start_server(f_in, f_out, argc, argp);
+       start_server(f_in, f_out, argc, argv);
 
        return 0;
 }
@@ -546,7 +613,7 @@ static void send_listing(int fd)
    here */
 int start_daemon(int f_in, int f_out)
 {
-       char line[200];
+       char line[1024];
        char *motd;
        int i;