diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2020-10-16 19:26:33 +0200 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2020-10-16 19:26:33 +0200 |
| commit | 809a2659e31ee637eddefffa5af3738fcd60a79d (patch) | |
| tree | bee667599de8e460e4d332d381545984c1b63368 | |
| parent | 438ed959d8bfb51df38dd6cc8ca4da6f6122f1cd (diff) | |
| parent | e2430bcb8327682340d985f89ad5137efa2f0d4f (diff) | |
Merge remote-tracking branch 'origin/master' into obsd
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | launchd/privileged_startx/server.c | 2 | ||||
| -rw-r--r-- | startx.cpp | 15 |
3 files changed, 4 insertions, 15 deletions
@@ -10,7 +10,7 @@ Xorg mailing list: https://lists.x.org/mailman/listinfo/xorg -The master development code repository can be found at: +The primary development code repository can be found at: https://gitlab.freedesktop.org/xorg/app/xinit diff --git a/launchd/privileged_startx/server.c b/launchd/privileged_startx/server.c index a93cae3..005758d 100644 --- a/launchd/privileged_startx/server.c +++ b/launchd/privileged_startx/server.c @@ -137,7 +137,7 @@ int server_main(const char *dir) { } if (launch_data_get_type(config) == LAUNCH_DATA_ERRNO) { - asl_log(NULL, NULL, ASL_LEVEL_ERR, "launchd checkin failed eith error: %d %s", launch_data_get_errno(config), strerror(launch_data_get_errno(config))); + asl_log(NULL, NULL, ASL_LEVEL_ERR, "launchd checkin failed with error: %d %s", launch_data_get_errno(config), strerror(launch_data_get_errno(config))); exit(EXIT_FAILURE); } @@ -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) |