diff options
| author | Wayne Davison <wayned@samba.org> | 2009-10-20 15:05:15 -0700 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2009-10-20 15:05:15 -0700 |
| commit | 8b3e6fb98511b08673603893c13f4fa702f85153 (patch) | |
| tree | a0f3184f52d44b266f36ab9b5dc9594e4a130cd3 /clientserver.c | |
| parent | d7205694223490eb20bb968f725859575eb8e643 (diff) | |
| download | android_external_rsync-8b3e6fb98511b08673603893c13f4fa702f85153.tar.gz android_external_rsync-8b3e6fb98511b08673603893c13f4fa702f85153.tar.bz2 android_external_rsync-8b3e6fb98511b08673603893c13f4fa702f85153.zip | |
Make sure daemon's io_timeout is used as a maximum value.
Diffstat (limited to 'clientserver.c')
| -rw-r--r-- | clientserver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clientserver.c b/clientserver.c index 496a6ab4..f385e6ef 100644 --- a/clientserver.c +++ b/clientserver.c @@ -947,7 +947,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char && (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 |