--- fax/faxspool.in~	Sat Jul  9 14:25:15 2005
+++ fax/faxspool.in	Sat Jul  9 14:30:44 2005
@@ -401,11 +401,11 @@
 
 # user name (for fax header only! auth is done by faxq-helper via getuid())
 ##########
-if user=`logname 2>/dev/null`
-then :
+if [ `id -u` = 0 ]; then
+    user=root
 else
     id=`id`
-    user=`expr "$id" : "[^( ]*(\([^)]*\)"`
+    user=`logname`
 fi
 test -z "$user" && user=$LOGNAME
 test -z "$user" && user=$USER