masqmail
changeset 340:60bb2dbe2866 0.3.3
In the tests: replaced logname(1) with $LOGNAME
Because logname(1) may not work if it has no controlling terminal.
See: http://aplawrence.com/cgi-bin/printer.pl?arg=/Forum/TonyLawrence8.html
Be it that reason or not, it didn't work on Crux, but $LOGNAME is set.
author | markus schnalke <meillo@marmaro.de> |
---|---|
date | Wed, 31 Aug 2011 09:14:38 +0200 |
parents | e6864daf89f4 |
children | 7caf6f799e99 |
files | tests/hostname-stdin/makefile tests/hostname-stdin/test.tpl tests/localhost-stdin/makefile tests/localhost-stdin/test tests/relay-to-hostname-mta/test.tpl tests/relay-to-localhost-mta/test.tpl |
diffstat | 6 files changed, 10 insertions(+), 10 deletions(-) [+] |
line diff
1.1 --- a/tests/hostname-stdin/makefile Wed Aug 31 08:46:00 2011 +0200 1.2 +++ b/tests/hostname-stdin/makefile Wed Aug 31 09:14:38 2011 +0200 1.3 @@ -17,4 +17,4 @@ 1.4 1.5 realclean: clean 1.6 rm -rf ./input ./lock 1.7 - rm -f *.log `logname` 1.8 + rm -f *.log $(LOGNAME)
2.1 --- a/tests/hostname-stdin/test.tpl Wed Aug 31 08:46:00 2011 +0200 2.2 +++ b/tests/hostname-stdin/test.tpl Wed Aug 31 09:14:38 2011 +0200 2.3 @@ -3,9 +3,9 @@ 2.4 # path to the masqmail executable 2.5 mm_bin=../../src/masqmail 2.6 2.7 -hfrom="\"Fritz Meier\" <`logname`@RECV_HOST>" 2.8 +hfrom="\"Fritz Meier\" <$LOGNAME@RECV_HOST>" 2.9 hto="$hfrom" 2.10 -to=`logname`@RECV_HOST 2.11 +to=$LOGNAME@RECV_HOST 2.12 hsubject="Masqmail test: hostname-stdin" 2.13 2.14
3.1 --- a/tests/localhost-stdin/makefile Wed Aug 31 08:46:00 2011 +0200 3.2 +++ b/tests/localhost-stdin/makefile Wed Aug 31 09:14:38 2011 +0200 3.3 @@ -13,4 +13,4 @@ 3.4 3.5 realclean: clean 3.6 rm -rf ./input ./lock 3.7 - rm -f *.log `logname` 3.8 + rm -f *.log $(LOGNAME)
4.1 --- a/tests/localhost-stdin/test Wed Aug 31 08:46:00 2011 +0200 4.2 +++ b/tests/localhost-stdin/test Wed Aug 31 09:14:38 2011 +0200 4.3 @@ -4,9 +4,9 @@ 4.4 mm_bin=../../src/masqmail 4.5 4.6 4.7 -hfrom="\"Fritz Meier\" <`logname`@localhost>" 4.8 +hfrom="\"Fritz Meier\" <$LOGNAME@localhost>" 4.9 hto=$hfrom 4.10 -to=`logname`@localhost 4.11 +to=$LOGNAME@localhost 4.12 hsubject="Masqmail test: localhost-stdin" 4.13 4.14
5.1 --- a/tests/relay-to-hostname-mta/test.tpl Wed Aug 31 08:46:00 2011 +0200 5.2 +++ b/tests/relay-to-hostname-mta/test.tpl Wed Aug 31 09:14:38 2011 +0200 5.3 @@ -3,9 +3,9 @@ 5.4 # path to the masqmail executable 5.5 mm_bin=../../src/masqmail 5.6 5.7 -hfrom="\"Fritz Meier\" <`logname`@RECV_HOST>" 5.8 +hfrom="\"Fritz Meier\" <$LOGNAME@RECV_HOST>" 5.9 hto="$hfrom" 5.10 -to=`logname`@RECV_HOST 5.11 +to=$LOGNAME@RECV_HOST 5.12 hsubject="Masqmail test: relay-to-hostname-mta" 5.13 5.14
6.1 --- a/tests/relay-to-localhost-mta/test.tpl Wed Aug 31 08:46:00 2011 +0200 6.2 +++ b/tests/relay-to-localhost-mta/test.tpl Wed Aug 31 09:14:38 2011 +0200 6.3 @@ -3,9 +3,9 @@ 6.4 # path to the masqmail executable 6.5 mm_bin=../../src/masqmail 6.6 6.7 -hfrom="\"Fritz Meier\" <`logname`@RECV_HOST>" 6.8 +hfrom="\"Fritz Meier\" <$LOGNAME@RECV_HOST>" 6.9 hto="$hfrom" 6.10 -to=`logname`@RECV_HOST 6.11 +to=$LOGNAME@RECV_HOST 6.12 hsubject="Masqmail test: relay-to-localhost-mta" 6.13 6.14