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
use syslog instead of /var/adm/rsyncd.log
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
20dc702
..
e047d96
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-33,10
+33,11
@@
void rprintf(int fd, const char *format, ...)
extern int am_daemon;
if (am_daemon) {
extern int am_daemon;
if (am_daemon) {
- static FILE *logf;
- if (!logf) logf = fopen(RSYNCD_LOG, "a");
- f = logf;
- if (!f) return;
+#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);
}
va_start(ap, format);
@@
-50,20
+51,28
@@
void rprintf(int fd, const char *format, ...)
if (len < 0) exit_cleanup(1);
if (len < 0) exit_cleanup(1);
- if (!am_daemon) {
- if (fd == FERROR) {
- f = stderr;
- }
-
- if (fd == FINFO) {
- extern int am_server;
- if (am_server)
- f = stderr;
- else
- f = stdout;
- }
+ buf[len] = 0;
+
+ if (am_daemon) {
+ int priority = LOG_INFO;
+ if (fd == FERROR) priority = LOG_WARNING;
+
+ syslog(priority, "%s", buf);
+ return;
}
}
+ if (fd == FERROR) {
+ f = stderr;
+ }
+
+ if (fd == FINFO) {
+ extern int am_server;
+ if (am_server)
+ f = stderr;
+ else
+ f = stdout;
+ }
+
if (!f) exit_cleanup(1);
if (fwrite(buf, len, 1, f) != 1) exit_cleanup(1);
if (!f) exit_cleanup(1);
if (fwrite(buf, len, 1, f) != 1) exit_cleanup(1);