improved max connections code. Now use fcntl instead of flock.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 78e2104..173ca0c 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -48,6 +48,8 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
 
        sargs[sargc] = NULL;
 
+       io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
+
        if (!read_line(fd, line, sizeof(line)-1)) {
                return -1;
        }
@@ -56,8 +58,6 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
                return -1;
        }
 
-       io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
-
        p = strchr(path,'/');
        if (p) *p = 0;
        io_printf(fd,"%s\n",path);
@@ -67,6 +67,14 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
                if (!read_line(fd, line, sizeof(line)-1)) {
                        return -1;
                }
+
+#if 0
+               if (strncmp(line,"@RSYNCD: AUTHREQD ",18) == 0) {
+                       auth_client(fd, line+18);
+                       continue;
+               }
+#endif
+
                if (strcmp(line,"@RSYNCD: OK") == 0) break;
                rprintf(FINFO,"%s\n", line);
        }
@@ -101,6 +109,7 @@ static int rsync_module(int fd, int i)
        char *p;
        char *addr = client_addr(fd);
        char *host = client_name(fd);
+       char *auth;
 
        if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
                rprintf(FERROR,"rsync denied on module %s from %s (%s)\n",
@@ -108,6 +117,14 @@ static int rsync_module(int fd, int i)
                return -1;
        }
 
+#if 0
+       if (!auth_server(fd, "@RSYNCD: AUTHREQD ")) {
+               rprintf(FERROR,"auth failed on module %s from %s (%s)\n",
+                       lp_name(i), client_name(fd), client_addr(fd));
+               return -1;              
+       }
+#endif
+
        if (!claim_connection(lp_lock_file(), lp_max_connections())) {
                rprintf(FERROR,"ERROR: max connections reached\n");
                return -1;
@@ -115,7 +132,7 @@ static int rsync_module(int fd, int i)
 
        rprintf(FINFO,"rsync on module %s from %s (%s)\n",
                lp_name(i), host, addr);
-
+       
        module_id = i;
 
        if (lp_read_only(i))
@@ -226,14 +243,6 @@ static int start_daemon(int fd)
 
        io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
 
-       if (!read_line(fd, line, sizeof(line)-1)) {
-               return -1;
-       }
-
-       if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) {
-               return -1;
-       }       
-
        motd = lp_motd_file();
        if (*motd) {
                FILE *f = fopen(motd,"r");
@@ -248,6 +257,14 @@ static int start_daemon(int fd)
                io_printf(fd,"\n");
        }
 
+       if (!read_line(fd, line, sizeof(line)-1)) {
+               return -1;
+       }
+
+       if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) {
+               return -1;
+       }       
+
        while (i == -1) {
 
                line[0] = 0;