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
updated the README a bit
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
e047d96
..
068b5a9
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-31,31
+31,36
@@
void rprintf(int fd, const char *format, ...)
int len;
FILE *f=NULL;
extern int am_daemon;
int len;
FILE *f=NULL;
extern int am_daemon;
-
- if (am_daemon) {
-#ifdef LOG_DAEMON
- openlog("rsyncd", LOG_PID, LOG_DAEMON);
-#else /* for old systems that have no facility codes. */
- openlog("rsyncd", LOG_PID);
-#endif
- }
va_start(ap, format);
#if HAVE_VSNPRINTF
len = vsnprintf(buf, sizeof(buf)-1, format, ap);
#else
va_start(ap, format);
#if HAVE_VSNPRINTF
len = vsnprintf(buf, sizeof(buf)-1, format, ap);
#else
- len = vsprintf(buf, format, ap);
+ vsprintf(buf, format, ap);
+ len = strlen(buf);
#endif
va_end(ap);
if (len < 0) exit_cleanup(1);
#endif
va_end(ap);
if (len < 0) exit_cleanup(1);
+ if (len > sizeof(buf)-1) exit_cleanup(1);
+
buf[len] = 0;
if (am_daemon) {
buf[len] = 0;
if (am_daemon) {
+ static int initialised;
int priority = LOG_INFO;
if (fd == FERROR) priority = LOG_WARNING;
int priority = LOG_INFO;
if (fd == FERROR) priority = LOG_WARNING;
+
+ if (!initialised) {
+ initialised = 1;
+#ifdef LOG_DAEMON
+ openlog("rsyncd", LOG_PID, lp_syslog_facility());
+#else
+ openlog("rsyncd", LOG_PID);
+#endif
+ }
syslog(priority, "%s", buf);
return;
syslog(priority, "%s", buf);
return;