X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8ef4ffd6987bb566c268d2a353d5fea1cfd9e430..0c515f17c44344813e8949fbb684b357ad70cfdf:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 95ca7b6c..18d9494e 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -99,6 +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), host, addr);
 
 	module_id = i;
 
@@ -123,8 +139,6 @@ static int rsync_module(int fd, int i)
 		gid = atoi(p);
 	}
 
-	rprintf(FERROR,"rsyncd starting\n");
-
 	if (chroot(lp_path(i))) {
 		io_printf(fd,"@ERROR: chroot failed\n");
 		return -1;
@@ -202,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");
 
@@ -260,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);