mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-05-24 23:05:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Moved the calls to client_addr() and client_name() below the lp_load()

Browse Source 
call so that their potential to output log messages can't cause the
log-file to initialize before we know what "log name" to use.
This commit is contained in:
Wayne Davison
2006-04-08 16:03:16 +00:00
parent e09d8a304c
commit 374c3e1278
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
clientserver.c
View File

@@ -44,7 +44,6 @@ 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;
@@ -729,21 +728,21 @@ static void send_listing(int fd)
int start_daemon(int f_in, int f_out)
{
char line[1024];
char *motd;
char *addr = client_addr(f_in);
char *host = client_name(f_in);
char *motd, *addr, *host;
int i;
io_set_sock_fds(f_in, f_out);
if (log_initialised)
rprintf(FLOG, "connect from %s (%s)\n", host, addr);
/* We must load the config file before calling any function that
* might cause log-file output to occur. This ensures that the
* "log file" param gets honored for the 2 non-forked use-cases
* (called by init and called by remote shell). */
if (!lp_load(config_file, 0))
exit_cleanup(RERR_SYNTAX);
if (!log_initialised)
log_init();
addr = client_addr(f_in);
host = client_name(f_in);
rprintf(FLOG, "connect from %s (%s)\n", host, addr);
if (!am_server) {
set_socket_options(f_in, "SO_KEEPALIVE");