#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
extern iconv_t ic_chck;
#endif
+extern char curr_dir[];
+extern unsigned int module_dirlen;
static int log_initialised;
static int logfile_was_closed;
{ 0, NULL }
};
-
/*
* Map from rsync error code to name, or return NULL.
*/
#endif
#ifdef LOG_DAEMON
- openlog("rsyncd", options, lp_syslog_facility());
+ openlog("rsyncd", options, lp_syslog_facility(module_id));
#else
openlog("rsyncd", options);
#endif
}
}
-void log_init(void)
+void log_init(int restart)
{
- if (log_initialised)
- return;
- log_initialised = 1;
+ if (log_initialised) {
+ if (!restart)
+ return;
+ if (strcmp(logfile_name, lp_log_file(module_id)) != 0) {
+ if (logfile_fp) {
+ fclose(logfile_fp);
+ logfile_fp = NULL;
+ } else
+ closelog();
+ logfile_name = NULL;
+ } else if (*logfile_name)
+ return; /* unchanged, non-empty "log file" names */
+ else if (lp_syslog_facility(-1) != lp_syslog_facility(module_id))
+ closelog();
+ else
+ return; /* unchanged syslog settings */
+ } else
+ log_initialised = 1;
/* This looks pointless, but it is needed in order for the
* C library on some systems to fetch the timezone info
/* Optionally use a log file instead of syslog. (Non-daemon
* rsyncs will have already set logfile_name, as needed.) */
if (am_daemon && !logfile_name)
- logfile_name = lp_log_file();
+ logfile_name = lp_log_file(module_id);
if (logfile_name && *logfile_name)
logfile_open();
else
return;
in_block = 1;
if (!log_initialised)
- log_init();
+ log_init(0);
strlcpy(msg, buf, MIN((int)sizeof msg, len + 1));
logit(priority, msg);
in_block = 0;
char buf[BIGPATHBUFLEN];
size_t len;
- strcpy(buf, RSYNC_NAME ": ");
+ strlcpy(buf, RSYNC_NAME ": ", sizeof buf);
len = (sizeof RSYNC_NAME ": ") - 1;
va_start(ap, format);
strlcpy(n, buf2, MAXPATHLEN);
else
n = buf2;
+ } else if (*n != '/') {
+ pathjoin(buf2, sizeof buf2,
+ curr_dir + module_dirlen, n);
+ clean_fname(buf2, 0);
+ if (fmt[1])
+ strlcpy(n, buf2, MAXPATHLEN);
+ else
+ n = buf2;
} else
clean_fname(n, 0);
if (*n == '/')
case 'L':
if (hlink && *hlink) {
n = hlink;
- strcpy(buf2, " => ");
+ strlcpy(buf2, " => ", sizeof buf2);
} else if (S_ISLNK(file->mode) && file->u.link) {
n = file->u.link;
- strcpy(buf2, " -> ");
+ strlcpy(buf2, " -> ", sizeof buf2);
} else {
n = "";
if (!fmt[1])
break;
- strcpy(buf2, " ");
+ strlcpy(buf2, " ", sizeof buf2);
}
strlcat(fmt, "s", sizeof fmt);
snprintf(buf2 + 4, sizeof buf2 - 4, fmt, n);