diff options
| author | Phil Pennock <pdp@exim.org> | 2011-01-16 21:54:53 -0500 |
|---|---|---|
| committer | Phil Pennock <pdp@exim.org> | 2011-01-16 21:56:06 -0500 |
| commit | fea24b2ea4e2c2a4b77d6fb222054e32e658b227 (patch) | |
| tree | a35b69a47f8dcca231045cf709ae923c7fb56f97 | |
| parent | eec525c43adade97ff94d839810faf7cb35bd87f (diff) | |
Let /dev/null have normal permissions.
The 4.73 fixes were a little too stringent and complained about the
permissions on /dev/null. Exempt it from some checks.
Reported by Andreas M. Kirchwitz
| -rw-r--r-- | doc/doc-txt/ChangeLog | 5 | ||||
| -rw-r--r-- | src/src/readconf.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index e27496b75..0780fc7da 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -22,6 +22,11 @@ PP/01 Bugzilla 139: Documentation and portability issues. Avoid GNU Makefile-isms, let Exim continue to build on BSD. Handle per-OS dynamic-module compilation flags. +PP/02 Let /dev/null have normal permissions. + The 4.73 fixes were a little too stringent and complained about the + permissions on /dev/null. Exempt it from some checks. + Reported by Andreas M. Kirchwitz. + Exim version 4.73 ----------------- diff --git a/src/src/readconf.c b/src/src/readconf.c index 118ccf5fe..0b78958e4 100644 --- a/src/src/readconf.c +++ b/src/src/readconf.c @@ -2875,9 +2875,9 @@ else } /* Check the status of the file we have opened, if we have retained root -privileges. */ +privileges and the file isn't /dev/null (which *should* be 0666). */ -if (trusted_config) +if (trusted_config && Ustrcmp(filename, US"/dev/null")) { if (fstat(fileno(config_file), &statbuf) != 0) log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to stat configuration file %s", |