Attachment 184314 Details for Bug 220668 – Patch to remove warnings and align displayname with `xauth`

[patch] Patch to remove warnings and align displayname with `xauth`

file_220668.txt (text/plain), 1.05 KB, created by Duane on 2017-07-12 23:16:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Duane

Created: 2017-07-12 23:16:34 UTC

Size: 1.05 KB

patch

obsolete

>Index: /usr/local/bin/startx	2017-07-12 17:44:58.262883000 +1000
>@@ -179,6 +179,7 @@
>     # create a file with auth information for the server. ':0' is a dummy.
>     xserverauthfile=$HOME/.serverauth.$$
>     trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
>+    touch "$xserverauthfile"
>     xauth -q -f "$xserverauthfile" << EOF
> add :$dummy . $mcookie
> EOF
>@@ -192,9 +193,9 @@
>     # now add the same credentials to the client authority file
>     # if '$displayname' already exists do not overwrite it as another
>     # server man need it. Add them to the '$xserverauthfile' instead.
>-    for displayname in $authdisplay $hostname$authdisplay; do
>+    for displayname in $authdisplay $hostname/unix$authdisplay; do
>         authcookie=`xauth list "$displayname" \
>-        | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;
>+        | sed -n "s|.*$displayname[[:space:]*].*[[:space:]*]||p"` 2>/dev/null;
>         if [ "z${authcookie}" = "z" ] ; then
>             xauth -q << EOF 
> add $displayname . $mcookie

Actions: View | Diff

Attachments on bug 220668: 184314 | 184458 | 184847