diff options
| author | Wayne Davison <wayned@samba.org> | 2006-04-06 07:38:54 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2006-04-06 07:38:54 +0000 |
| commit | 2a7d9fe9b8792cc6b419b2e25e7cf73d1c06376c (patch) | |
| tree | cac814f0b10a46b6d06dd5cce5cd2b25cbcb1a0a /clientserver.c | |
| parent | e63aeb6d68aff4668064dd3a44b6979fab0733a8 (diff) | |
| download | android_external_rsync-2a7d9fe9b8792cc6b419b2e25e7cf73d1c06376c.tar.gz android_external_rsync-2a7d9fe9b8792cc6b419b2e25e7cf73d1c06376c.tar.bz2 android_external_rsync-2a7d9fe9b8792cc6b419b2e25e7cf73d1c06376c.zip | |
A slightly better fix than the last version.
Diffstat (limited to 'clientserver.c')
| -rw-r--r-- | clientserver.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/clientserver.c b/clientserver.c index 4c8057ee..3e71cd90 100644 --- 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 log_initialised; 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); + if (log_initialised) + rprintf(FLOG, "connect from %s (%s)\n", host, addr); + 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"); |