Merge remote-tracking branch 'origin/master' into obsd

1 files changed, 2 insertions, 13 deletions

diff --git a/startx.cpp b/startx.cpp
index 3ab9a26..1a913ae 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -96,7 +96,7 @@ if [ x`defaults read $X11_PREFS_DOMAIN cache_fonts` = x1 ] ; then
 fi
 
 if [ -x __libexecdir__/privileged_startx ] ; then
-	# Don't push this into the background becasue it can cause
+	# Don't push this into the background because it can cause
 	# a race to create /tmp/.X11-unix
 	__libexecdir__/privileged_startx
 fi
@@ -251,18 +251,7 @@ if [ x"$enable_xauth" = x1 ] ; then
     removelist=
 
     XCOMM set up default Xauth info for this machine
-    case `uname` in
-    Linux*)
-        if [ -z "`hostname --version 2>&1 | grep GNU`" ]; then
-            hostname=`hostname -f`
-        else
-            hostname=`hostname`
-        fi
-        ;;
-    *)
-        hostname=`hostname`
-        ;;
-    esac
+    hostname=`uname -n`
 
     authdisplay=${display:-:0}
 #if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE)