Attachment 88905 Details for Bug 79936 – Patch against logrotate-3.6.6 fixing olddir-behavior

[patch] Patch against logrotate-3.6.6 fixing olddir-behavior

logrotate-3.6.6-olddir.patch (text/plain), 1.23 KB, created by Enrico Scholz on 2002-12-25 18:59:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Enrico Scholz

Created: 2002-12-25 18:59:22 UTC

Size: 1.23 KB

patch

obsolete

>2002-12-25 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
>	* config.c: Fixed olddir handling
>
>diff -upr logrotate-3.6.6/config.c logrotate-3.6.6.olddir/config.c
>--- logrotate-3.6.6/config.c	2002-12-10 18:41:16.000000000 +0100
>+++ logrotate-3.6.6.olddir/config.c	2002-12-25 16:49:16.000000000 +0100
>@@ -906,14 +906,7 @@ static int readConfigFile(const char * c
> 		    sprintf(ld, "%s/%s", dirName, newlog->oldDir);
> 		    free(dirName);
> 
>-		    if (sb.st_dev != sb2.st_dev) {
>-			message(MESS_ERROR, "%s:%d olddir %s and log file %s "
>-				    "are on different devices\n", configFile,
>-				    lineNum, newlog->oldDir, newlog->files[i]);
>-			return 1;
>-		    }
>-
>-		    if(newlog->oldDir[0] == '/') dirName = ld;
>+		    if(newlog->oldDir[0] != '/') dirName = ld;
> 		    else dirName = newlog->oldDir;
> 		    if(stat(dirName, &sb)) {
> 			message(MESS_ERROR, "%s:%d error verifying olddir "
>@@ -921,6 +914,13 @@ static int readConfigFile(const char * c
> 				dirName, strerror(errno));
> 				return 1;
> 		    }
>+
>+		    if (sb.st_dev != sb2.st_dev) {
>+			message(MESS_ERROR, "%s:%d olddir %s and log file %s "
>+				    "are on different devices\n", configFile,
>+				    lineNum, newlog->oldDir, newlog->files[i]);
>+			return 1;
>+		    }
> 		}
> 	    }
>

Actions: View | Diff

Attachments on bug 79936: 88905