Document the fact that the %t log format option includes the date, and

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index f7293bf..49928d5 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -24,6 +24,7 @@ extern int module_id;
 extern int read_only;
 extern int verbose;
 extern int rsync_port;
+char *auth_user;
 
 int start_socket_client(char *host, char *path, int argc, char *argv[])
 {
@@ -55,7 +56,7 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
 
        fd = open_socket_out(host, rsync_port);
        if (fd == -1) {
-               exit_cleanup(1);
+               exit_cleanup(RERR_SOCKETIO);
        }
        
        server_options(sargs,&sargc);
@@ -121,7 +122,6 @@ static int rsync_module(int fd, int i)
        char *addr = client_addr(fd);
        char *host = client_name(fd);
        char *name = lp_name(i);
-       char *user;
        int use_chroot = lp_use_chroot(i);
        int start_glob=0;
        int ret;
@@ -138,24 +138,24 @@ static int rsync_module(int fd, int i)
                return -1;
        }
 
-       if (!claim_connection(lp_lock_file(), lp_max_connections())) {
+       if (!claim_connection(lp_lock_file(i), lp_max_connections(i))) {
                if (errno) {
                        rprintf(FERROR,"failed to open lock file %s : %s\n",
-                               lp_lock_file(), strerror(errno));
+                               lp_lock_file(i), strerror(errno));
                        io_printf(fd,"@ERROR: failed to open lock file %s : %s\n",
-                                 lp_lock_file(), strerror(errno));
+                                 lp_lock_file(i), strerror(errno));
                } else {
                        rprintf(FERROR,"max connections (%d) reached\n",
-                               lp_max_connections());
-                       io_printf(fd,"@ERROR: max connections (%d) reached - try again later\n", lp_max_connections());
+                               lp_max_connections(i));
+                       io_printf(fd,"@ERROR: max connections (%d) reached - try again later\n", lp_max_connections(i));
                }
                return -1;
        }
 
        
-       user = auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ");
+       auth_user = auth_server(fd, i, addr, "@RSYNCD: AUTHREQD ");
 
-       if (!user) {
+       if (!auth_user) {
                rprintf(FERROR,"auth failed on module %s from %s (%s)\n",
                        name, client_name(fd), client_addr(fd));
                io_printf(fd,"@ERROR: auth failed on module %s\n",name);
@@ -187,6 +187,12 @@ static int rsync_module(int fd, int i)
                gid = atoi(p);
        }
 
+       p = lp_include_from(i);
+       add_exclude_file(p, 1, 1);
+
+       p = lp_include(i);
+       add_include_line(p);
+
        p = lp_exclude_from(i);
        add_exclude_file(p, 1, 0);
 
@@ -253,7 +259,7 @@ static int rsync_module(int fd, int i)
                                request = strdup(p);
                                start_glob++;
                        }
-                       glob_expand(name, argv, &argc, MAX_ARGS);
+                       glob_expand(name, argv, &argc, MAX_ARGS, !use_chroot);
                } else {
                        argc++;
                }
@@ -276,19 +282,17 @@ static int rsync_module(int fd, int i)
                 *    and which aren't.
                 */
                for (i = 1; i < argc; i++) {
-                       char *copy = sanitize_path(argv[i]);
-                       free((void *)argv[i]);
-                       argv[i] = copy;
+                       sanitize_path(argv[i]);
                }
        }
 
        ret = parse_arguments(argc, argv);
 
        if (request) {
-               if (*user) {
+               if (*auth_user) {
                        rprintf(FINFO,"rsync %s %s from %s@%s (%s)\n",
                                am_sender?"on":"to",
-                               request, user, host, addr);
+                               request, auth_user, host, addr);
                } else {
                        rprintf(FINFO,"rsync %s %s from %s (%s)\n",
                                am_sender?"on":"to",
@@ -310,8 +314,12 @@ static int rsync_module(int fd, int i)
                io_start_multiplex_out(fd);
 
        if (!ret) {
-               rprintf(FERROR,"Error parsing options (unsupported option?) - aborting\n");
-               exit_cleanup(1);
+               option_error();
+       }
+
+       if (lp_timeout(i)) {
+               extern int io_timeout;
+               io_timeout = lp_timeout(i);
        }
 
        start_server(fd, fd, argc, argp);
@@ -343,7 +351,7 @@ static int start_daemon(int fd)
        extern int remote_version;
 
        if (!lp_load(config_file, 0)) {
-               exit_cleanup(1);
+               exit_cleanup(RERR_SYNTAX);
        }
 
        set_socket_options(fd,"SO_KEEPALIVE");
@@ -433,7 +441,7 @@ int daemon_main(void)
 
        if (!lp_load(config_file, 1)) {
                fprintf(stderr,"failed to load config file %s\n", config_file);
-               exit_cleanup(1);
+               exit_cleanup(RERR_SYNTAX);
        }
 
        log_open();
@@ -447,7 +455,7 @@ int daemon_main(void)
                if ((f = fopen(lp_pid_file(), "w")) == NULL) {
                    cleanup_set_pid(0);
                    fprintf(stderr,"failed to create pid file %s\n", pid_file);
-                   exit_cleanup(1);
+                   exit_cleanup(RERR_FILEIO);
                }
                fprintf(f, "%d\n", pid);
                fclose(f);