static FILE *logfile;
-/****************************************************************************
- return the date and time as a string
-****************************************************************************/
-static char *timestring(void )
-{
- static char TimeBuf[200];
- time_t t = time(NULL);
- struct tm *tm = localtime(&t);
-
-#ifdef HAVE_STRFTIME
- strftime(TimeBuf,sizeof(TimeBuf)-1,"%Y/%m/%d %T",tm);
-#else
- strlcpy(TimeBuf, asctime(tm), sizeof(TimeBuf)-1);
-#endif
-
- if (TimeBuf[strlen(TimeBuf)-1] == '\n') {
- TimeBuf[strlen(TimeBuf)-1] = 0;
- }
-
- return(TimeBuf);
-}
-
static void logit(int priority, char *buf)
{
if (logfile) {
fprintf(logfile,"%s [%d] %s",
- timestring(), (int)getpid(), buf);
+ timestring(time(NULL)), (int)getpid(), buf);
fflush(logfile);
} else {
syslog(priority, "%s", buf);
if (initialised) return;
initialised = 1;
+ /* this looks pointless, but it is needed in order for the
+ C library on some systems to fetch the timezone info
+ before the chroot */
+ t = time(NULL);
+ localtime(&t);
+
+ /* optionally use a log file instead of syslog */
logf = lp_log_file();
if (logf && *logf) {
+ extern int orig_umask;
+ int old_umask = umask(022 | orig_umask);
logfile = fopen(logf, "a");
+ umask(old_umask);
return;
}
#ifndef LOG_NDELAY
logit(LOG_INFO,"rsyncd started\n");
#endif
-
- /* this looks pointless, but it is needed in order for the
- C library on some systems to fetch the timezone info
- before the chroot */
- t = time(NULL);
- localtime(&t);
}
FILE *f=NULL;
extern int am_daemon;
/* recursion can happen with certain fatal conditions */
- static int depth;
-
- if (depth) return;
va_start(ap, format);
len = vslprintf(buf, sizeof(buf)-1, format, ap);
}
if (am_daemon) {
+ static int depth;
int priority = LOG_INFO;
if (fd == FERROR) priority = LOG_WARNING;
+ if (depth) return;
+
depth++;
log_open();
static void log_formatted(char *op, struct file_struct *file)
{
extern int module_id;
+ extern char *auth_user;
char buf[1024];
char *p, *s, *n;
char buf2[100];
break;
case 'o': n = op; break;
case 'f': n = f_name(file); break;
+ case 'm': n = lp_name(module_id); break;
+ case 'P': n = lp_path(module_id); break;
+ case 'u': n = auth_user; break;
}
if (!n) continue;
}
if (l != 2) {
- memmove(s+(l-1), s+1, strlen(s+1));
+ memmove(s+(l-1), s+1, strlen(s+1)+1);
}
memcpy(p, n, l);