Index: tools/applygnupgdefaults
===================================================================
--- tools/applygnupgdefaults
+++ tools/applygnupgdefaults
@@ -1,5 +1,5 @@
 #!/bin/sh                                               
-# Apply defaults from/etc/gnupg/gpg.conf to all users             -*- sh -*-
+# Apply defaults from /etc/gnupg/gpg.conf to all users            -*- sh -*-
 #
 # Copyright 2007 Free Software Foundation, Inc.
 #
@@ -34,8 +34,7 @@
     [ -n "$errorfile" -a -f "$errorfile" ] && rm "$errorfile"
 }
 trap cleanup EXIT SIGINT SIGHUP SIGPIPE
-errorfile="/tmp/$PGM.$$.log"
-: >$errorfile
+errorfile=$(mktemp "${TMPDIR:-/tmp}/$PGM.XXXXXX") || exit $?
 
 
 # Check whether we can use getent
@@ -62,7 +61,7 @@
 
 ${cat_passwd} \
   | while IFS=: read -r user dmy_a uid dmy_c dmy_d home shell dmy_rest; do
-    # Process only entires with a valid login shell
+    # Process only entries with a valid login shell
     grep </etc/shells "^$shell" 2>/dev/null >/dev/null || continue
     # and with an existant gnupg home directory
     [ -d "$home/.gnupg" ] || continue