Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
need sys/file.h for flock()
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
32deee7
..
78e2104
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-32,7
+32,7
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
int sargc=0;
char line[1024];
char *p;
int sargc=0;
char line[1024];
char *p;
-
int
version;
+
extern int remote_
version;
fd = open_socket_out(host, rsync_port);
if (fd == -1) {
fd = open_socket_out(host, rsync_port);
if (fd == -1) {
@@
-52,7
+52,7
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
return -1;
}
return -1;
}
- if (sscanf(line,"@RSYNCD: %d", &version) != 1) {
+ if (sscanf(line,"@RSYNCD: %d", &
remote_
version) != 1) {
return -1;
}
return -1;
}
@@
-108,6
+108,11
@@
static int rsync_module(int fd, int i)
return -1;
}
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);
rprintf(FINFO,"rsync on module %s from %s (%s)\n",
lp_name(i), host, addr);
@@
-209,9
+214,9
@@
static int start_daemon(int fd)
{
char line[200];
char *motd;
{
char line[200];
char *motd;
- int version;
int i = -1;
extern char *config_file;
int i = -1;
extern char *config_file;
+ extern int remote_version;
if (!lp_load(config_file)) {
exit_cleanup(1);
if (!lp_load(config_file)) {
exit_cleanup(1);
@@
-225,7
+230,7
@@
static int start_daemon(int fd)
return -1;
}
return -1;
}
- if (sscanf(line,"@RSYNCD: %d", &version) != 1) {
+ if (sscanf(line,"@RSYNCD: %d", &
remote_
version) != 1) {
return -1;
}
return -1;
}