git.samba.org
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
2455140
)
Make sure daemon's io_timeout is used as a maximum value.
author
Wayne Davison
<wayned@samba.org>
Tue, 20 Oct 2009 22:05:15 +0000
(15:05 -0700)
committer
Wayne Davison
<wayned@samba.org>
Sun, 13 Dec 2009 01:24:39 +0000
(17:24 -0800)
clientserver.c
patch
|
blob
|
history
diff --git
a/clientserver.c
b/clientserver.c
index 18a22585dff0b5e8cc45f9220099bdec540e8d9b..c8d2a0e792105d1626466388e54b9e9103028560 100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-856,7
+856,7
@@
static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
&& (use_chroot ? lp_numeric_ids(i) != False : lp_numeric_ids(i) == True))
numeric_ids = -1; /* Set --numeric-ids w/o breaking protocol. */
- if (lp_timeout(i) &&
lp_timeout(i) > io_timeout
)
+ if (lp_timeout(i) &&
(!io_timeout || lp_timeout(i) < io_timeout)
)
set_io_timeout(lp_timeout(i));
/* If we have some incoming/outgoing chmod changes, append them to