added two new options "max connections" and "lock file"

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 71188e9..18d9494 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -99,9 +99,22 @@ static int rsync_module(int fd, int i)
        uid_t uid;
        gid_t gid;
        char *p;
+       char *addr = client_addr(fd);
+       char *host = client_name(fd);
+
+       if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
+               rprintf(FERROR,"rsync denied on module %s from %s (%s)\n",
+                       lp_name(i), client_name(fd), client_addr(fd));
+               return -1;
+       }
+
+       if (!claim_connection(lp_lock_file(), lp_max_connections())) {
+               rprintf(FERROR,"ERROR: max connections reached\n");
+               return -1;
+       }
 
        rprintf(FINFO,"rsync on module %s from %s (%s)\n",
-               lp_name(i), client_name(fd), client_addr(fd));
+               lp_name(i), host, addr);
 
        module_id = i;
 
@@ -203,6 +216,11 @@ static int start_daemon(int fd)
        char *motd;
        int version;
        int i = -1;
+       extern char *config_file;
+
+       if (!lp_load(config_file)) {
+               exit_cleanup(1);
+       }
 
        set_socket_options(fd,"SO_KEEPALIVE");
 
@@ -261,12 +279,6 @@ static int start_daemon(int fd)
 
 int daemon_main(void)
 {
-       extern char *config_file;
-
-       if (!lp_load(config_file)) {
-               exit_cleanup(1);
-       }
-
        if (is_a_socket(STDIN_FILENO)) {
                /* we are running via inetd */
                return start_daemon(STDIN_FILENO);