make renamecopy and copytruncate override each other

kdudka · kdudka · commit fe53a0efd21c · 2021-05-03T14:27:03.000+02:00
These option cannot work together. This rule prevents unnecessary rotation failure in case one of the options comes from the global configuration and the other one from log-specific configuration. Bug: https://bugzilla.redhat.com/1934601 Closes: #386
diff --git a/config.c b/config.c
@@ -1121,10 +1121,12 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
                         newlog->flags &= ~LOG_FLAG_SHAREDSCRIPTS;
                     } else if (!strcmp(key, "copytruncate")) {
                         newlog->flags |= LOG_FLAG_COPYTRUNCATE;
+                        newlog->flags &= ~LOG_FLAG_TMPFILENAME;
                     } else if (!strcmp(key, "nocopytruncate")) {
                         newlog->flags &= ~LOG_FLAG_COPYTRUNCATE;
                     } else if (!strcmp(key, "renamecopy")) {
                         newlog->flags |= LOG_FLAG_TMPFILENAME;
+                        newlog->flags &= ~LOG_FLAG_COPYTRUNCATE;
                     } else if (!strcmp(key, "norenamecopy")) {
                         newlog->flags &= ~LOG_FLAG_TMPFILENAME;
                     } else if (!strcmp(key, "copy")) {
diff --git a/logrotate.8.in b/logrotate.8.in
@@ -429,7 +429,7 @@ truncating it, so some logging data might be lost.
 When this option is used, the \fBcreate\fR option will have no effect,
 as the old log file stays in place.  The \fBcopytruncate\fR option allows
 storing rotated log files on the different devices using \fBolddir\fR
-directive.
+directive.  The \fBcopytruncate\fR option implies \fBnorenamecopy\fR.
 
 .TP
 \fBnocopytruncate\fR
@@ -443,6 +443,7 @@ Log file is renamed to temporary filename in the same directory by adding
 and log file is copied from temporary filename to final filename.  In the end,
 temporary filename is removed.  The \fBrenamecopy\fR option allows storing
 rotated log files on the different devices using \fBolddir\fR directive.
+The \fBrenamecopy\fR option implies \fBnocopytruncate\fR.
 
 .TP
 \fBnorenamecopy\fR
diff --git a/test/test-config.24.in b/test/test-config.24.in
@@ -1,5 +1,8 @@
 create
 
+# will be overridden by copytruncate
+renamecopy
+
 &DIR&/test*.log {
     daily
     copytruncate
diff --git a/test/test-config.58.in b/test/test-config.58.in
@@ -1,5 +1,8 @@
 create
 
+# will be overridden by renamecopy
+copytruncate
+
 &DIR&/test.log {
     renamecopy
     weekly
