Put temporary output in ${TMPDIR:-/tmp}

If $<basedir>_output is not set, don't redirect output

PR:	21395

2 files changed, 7 insertions, 7 deletions

diff --git a/usr.sbin/periodic/periodic.8 b/usr.sbin/periodic/periodic.8
index 4ab3dec48855..e15ee2cd1010 100644
--- a/usr.sbin/periodic/periodic.8
+++ b/usr.sbin/periodic/periodic.8
@@ -127,14 +127,13 @@ output.
 If the
 .Va <basedir>_output
 value does not begin with a
-.Dq / ,
-it is assumed to contain a list of email addresses, and the output is
-mailed to them.
+.Dq /
+and is not empty, it is assumed to contain a list of email addresses, and
+the output is mailed to them.
 .Pp
 If
 .Va <basedir>_output
-is not set, it defaults to
-.Dq root .
+is not set or is empty, output is sent to standard output.
 .Sh ENVIRONMENT
 The 
 .Nm
diff --git a/usr.sbin/periodic/periodic.sh b/usr.sbin/periodic/periodic.sh
index cb849b538ed5..35772efedfd3 100644
--- a/usr.sbin/periodic/periodic.sh
+++ b/usr.sbin/periodic/periodic.sh
@@ -27,7 +27,7 @@ fi
 
 host=`hostname`
 export host
-tmp_output=/var/run/periodic.$$
+tmp_output=${TMPDIR:-/tmp}/periodic.$$
 
 # Execute each executable file in the directory list.  If the x bit is not
 # set, assume the user didn't really want us to muck with it (it's a
@@ -39,7 +39,8 @@ do
     eval output=\$${arg##*/}_output
     case "$output" in
     /*) pipe="cat >>$output";;
-    *)  pipe="mail -s '$host ${arg##*/} run output' ${output:-root}";;
+    "") pipe=cat
+    *)  pipe="mail -s '$host ${arg##*/} run output' $output";;
     esac
 
     success=YES info=YES badconfig=NO	# Defaults when ${run}_* aren't YES/NO