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
A slightly better fix than the last version.
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
4c8057e
..
3e71cd9
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-44,6
+44,7
@@
extern int protocol_version;
extern int io_timeout;
extern int no_detach;
extern int default_af_hint;
extern int io_timeout;
extern int no_detach;
extern int default_af_hint;
+extern int log_initialised;
extern mode_t orig_umask;
extern char *bind_address;
extern char *sockopts;
extern mode_t orig_umask;
extern char *bind_address;
extern char *sockopts;
@@
-735,12
+736,14
@@
int start_daemon(int f_in, int f_out)
io_set_sock_fds(f_in, f_out);
io_set_sock_fds(f_in, f_out);
+ if (log_initialised)
+ rprintf(FLOG, "connect from %s (%s)\n", host, addr);
+
if (!lp_load(config_file, 0))
exit_cleanup(RERR_SYNTAX);
if (!lp_load(config_file, 0))
exit_cleanup(RERR_SYNTAX);
- log_init();
-
- rprintf(FLOG, "connect from %s (%s)\n", host, addr);
+ if (!log_initialised)
+ log_init();
if (!am_server) {
set_socket_options(f_in, "SO_KEEPALIVE");
if (!am_server) {
set_socket_options(f_in, "SO_KEEPALIVE");