# HG changeset patch # User markus schnalke # Date 1314774878 -7200 # Node ID 60bb2dbe286696a94cdc742efc84229862065891 # Parent e6864daf89f400af7e1fb2ca2e5f24b650df12b8 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. diff -r e6864daf89f4 -r 60bb2dbe2866 tests/hostname-stdin/makefile --- a/tests/hostname-stdin/makefile Wed Aug 31 08:46:00 2011 +0200 +++ b/tests/hostname-stdin/makefile Wed Aug 31 09:14:38 2011 +0200 @@ -17,4 +17,4 @@ realclean: clean rm -rf ./input ./lock - rm -f *.log `logname` + rm -f *.log $(LOGNAME) diff -r e6864daf89f4 -r 60bb2dbe2866 tests/hostname-stdin/test.tpl --- a/tests/hostname-stdin/test.tpl Wed Aug 31 08:46:00 2011 +0200 +++ b/tests/hostname-stdin/test.tpl Wed Aug 31 09:14:38 2011 +0200 @@ -3,9 +3,9 @@ # path to the masqmail executable mm_bin=../../src/masqmail -hfrom="\"Fritz Meier\" <`logname`@RECV_HOST>" +hfrom="\"Fritz Meier\" <$LOGNAME@RECV_HOST>" hto="$hfrom" -to=`logname`@RECV_HOST +to=$LOGNAME@RECV_HOST hsubject="Masqmail test: hostname-stdin" diff -r e6864daf89f4 -r 60bb2dbe2866 tests/localhost-stdin/makefile --- a/tests/localhost-stdin/makefile Wed Aug 31 08:46:00 2011 +0200 +++ b/tests/localhost-stdin/makefile Wed Aug 31 09:14:38 2011 +0200 @@ -13,4 +13,4 @@ realclean: clean rm -rf ./input ./lock - rm -f *.log `logname` + rm -f *.log $(LOGNAME) diff -r e6864daf89f4 -r 60bb2dbe2866 tests/localhost-stdin/test --- a/tests/localhost-stdin/test Wed Aug 31 08:46:00 2011 +0200 +++ b/tests/localhost-stdin/test Wed Aug 31 09:14:38 2011 +0200 @@ -4,9 +4,9 @@ mm_bin=../../src/masqmail -hfrom="\"Fritz Meier\" <`logname`@localhost>" +hfrom="\"Fritz Meier\" <$LOGNAME@localhost>" hto=$hfrom -to=`logname`@localhost +to=$LOGNAME@localhost hsubject="Masqmail test: localhost-stdin" diff -r e6864daf89f4 -r 60bb2dbe2866 tests/relay-to-hostname-mta/test.tpl --- a/tests/relay-to-hostname-mta/test.tpl Wed Aug 31 08:46:00 2011 +0200 +++ b/tests/relay-to-hostname-mta/test.tpl Wed Aug 31 09:14:38 2011 +0200 @@ -3,9 +3,9 @@ # path to the masqmail executable mm_bin=../../src/masqmail -hfrom="\"Fritz Meier\" <`logname`@RECV_HOST>" +hfrom="\"Fritz Meier\" <$LOGNAME@RECV_HOST>" hto="$hfrom" -to=`logname`@RECV_HOST +to=$LOGNAME@RECV_HOST hsubject="Masqmail test: relay-to-hostname-mta" diff -r e6864daf89f4 -r 60bb2dbe2866 tests/relay-to-localhost-mta/test.tpl --- a/tests/relay-to-localhost-mta/test.tpl Wed Aug 31 08:46:00 2011 +0200 +++ b/tests/relay-to-localhost-mta/test.tpl Wed Aug 31 09:14:38 2011 +0200 @@ -3,9 +3,9 @@ # path to the masqmail executable mm_bin=../../src/masqmail -hfrom="\"Fritz Meier\" <`logname`@RECV_HOST>" +hfrom="\"Fritz Meier\" <$LOGNAME@RECV_HOST>" hto="$hfrom" -to=`logname`@RECV_HOST +to=$LOGNAME@RECV_HOST hsubject="Masqmail test: relay-to-localhost-mta"