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
- Use an int32 for the each block-size variable.
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
bf5a133
..
ec74054
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-479,7
+479,7
@@
static int rsync_module(int f_in, int f_out, int i)
if (lp_timeout(i)) {
io_timeout = lp_timeout(i);
if (lp_timeout(i)) {
io_timeout = lp_timeout(i);
- if (io_timeout
&& io_timeout
< select_timeout)
+ if (io_timeout < select_timeout)
select_timeout = io_timeout;
}
select_timeout = io_timeout;
}
@@
-607,7
+607,7
@@
int daemon_main(void)
if (rsync_port == 0 && (rsync_port = lp_rsync_port()) == 0)
rsync_port = RSYNC_PORT;
if (rsync_port == 0 && (rsync_port = lp_rsync_port()) == 0)
rsync_port = RSYNC_PORT;
- if (bind_address == NULL)
+ if (bind_address == NULL
&& *lp_bind_address()
)
bind_address = lp_bind_address();
log_init();
bind_address = lp_bind_address();
log_init();