From 49b78fc1a8f1591fa172399b3be1dba4b7f23554 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Thu, 5 Jun 2008 01:10:03 +0000
Subject: Apply post-1.10.2 fixes, bump version to 1.10.3

---
 sysklogd/syslogd.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'sysklogd/syslogd.c')

diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 371b5588f..5f3ac2c2f 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -347,10 +347,11 @@ static void log_locally(time_t now, char *msg)
 				sprintf(newFile, "%s.%d", G.logFilePath, i);
 				if (i == 0) break;
 				sprintf(oldFile, "%s.%d", G.logFilePath, --i);
-				xrename(oldFile, newFile);
+				/* ignore errors - file might be missing */
+				rename(oldFile, newFile);
 			}
 			/* newFile == "f.0" now */
-			xrename(G.logFilePath, newFile);
+			rename(G.logFilePath, newFile);
 			fl.l_type = F_UNLCK;
 			fcntl(G.logFD, F_SETLKW, &fl);
 			close(G.logFD);
-- 
cgit v1.2.3-55-g6feb