X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8ef4ffd6987bb566c268d2a353d5fea1cfd9e430..ff8b29b8c62f377ede40fbf0cbbaa428bd8df60a:/log.c

diff --git a/log.c b/log.c
index 20dc702a..e047d96f 100644
--- a/log.c
+++ b/log.c
@@ -33,10 +33,11 @@ void rprintf(int fd, const char *format, ...)
 	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);
@@ -50,20 +51,28 @@ void rprintf(int fd, const char *format, ...)
 
 	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);