ph10 2006/02/16 14:54:16 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src readconf.c
exim-test/confs 0290
exim-test/scripts/0000-Basic 0290
Added files:
exim-test/paniclog 0290
exim-test/stderr 0290
Log:
Panic-die if .include specifies a non-absolute path.
Revision Changes Path
1.305 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.20 +4 -0 exim/exim-src/src/readconf.c
1.2 +2 -1 exim/exim-test/confs/0290
1.1 +2 -0 exim/exim-test/paniclog/0290 (new)
1.2 +3 -0 exim/exim-test/scripts/0000-Basic/0290
1.1 +3 -0 exim/exim-test/stderr/0290 (new)
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -r1.304 -r1.305
--- ChangeLog 16 Feb 2006 10:05:33 -0000 1.304
+++ ChangeLog 16 Feb 2006 14:54:15 -0000 1.305
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.304 2006/02/16 10:05:33 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.305 2006/02/16 14:54:15 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -190,6 +190,8 @@
PH/37 When running in the test harness, use -odi for submitted messages (e.g.
bounces) except when queue_only is set, to avoid logging races between
the different processes.
+
+PH/38 Panic-die if .include specifies a non-absolute path.
Exim version 4.60
Index: readconf.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/readconf.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- readconf.c 13 Feb 2006 12:02:59 -0000 1.19
+++ readconf.c 16 Feb 2006 14:54:15 -0000 1.20
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/readconf.c,v 1.19 2006/02/13 12:02:59 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/readconf.c,v 1.20 2006/02/16 14:54:15 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -811,6 +811,10 @@
t--;
}
*t = 0;
+
+ if (*ss != '/')
+ log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN, ".include specifies a non-"
+ "absolute path \"%s\"", ss);
if (include_if_exists != 0 && (Ustat(ss, &statbuf) != 0)) continue;
Index: 0290
===================================================================
RCS file: /home/cvs/exim/exim-test/confs/0290,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0290 7 Feb 2006 10:34:25 -0000 1.1
+++ 0290 16 Feb 2006 14:54:15 -0000 1.2
@@ -4,6 +4,7 @@
FOO=inc1
BAR=.include "DIR/aux-fixed/TESTNUM.inc2"
RT = receive_timeout = 1s
+INC=
C1=#
C2=#
@@ -22,8 +23,8 @@
# ----- Main settings -----
FOOBAR .include DIR/aux-fixed/TESTNUM.FOO
-
RT
+INC
remote_sort_domains = a:b:c
Index: 0290
====================================================================
1999-03-02 09:44:33 Exim configuration error in line 27 of TESTSUITE/test-config:
.include specifies a non-absolute path "non/absolute"
Index: 0290
===================================================================
RCS file: /home/cvs/exim/exim-test/scripts/0000-Basic/0290,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0290 7 Feb 2006 10:54:33 -0000 1.1
+++ 0290 16 Feb 2006 14:54:15 -0000 1.2
@@ -7,3 +7,6 @@
****
exim '-D RT = receive_timeout = 4s ' -bP receive_timeout
****
+1
+exim -DINC='.include non/absolute' -bP receive_timeout
+****
Index: 0290
====================================================================
LOG: PANIC DIE
Exim configuration error in line 27 of TESTSUITE/test-config:
.include specifies a non-absolute path "non/absolute"
