diff options
| author | Sebastian Schmelzer | 2009-01-19 14:18:46 +0100 |
|---|---|---|
| committer | Sebastian Schmelzer | 2009-01-19 14:18:46 +0100 |
| commit | 5e85f5cf71c79d0262ee892b7bc63f8f55b355e2 (patch) | |
| tree | bbf73cc724f33983e8b7fe2d74ad93b0f7241c75 | |
| parent | Fixing list of modules to ignore ... (hint by zooey) (diff) | |
| download | core-5e85f5cf71c79d0262ee892b7bc63f8f55b355e2.tar.gz core-5e85f5cf71c79d0262ee892b7bc63f8f55b355e2.tar.xz core-5e85f5cf71c79d0262ee892b7bc63f8f55b355e2.zip | |
* fix bug #325
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2497 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rwxr-xr-x | os-plugins/plugins/x11vnc/files/x11vnc-init | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/os-plugins/plugins/x11vnc/files/x11vnc-init b/os-plugins/plugins/x11vnc/files/x11vnc-init index a074d8dc..548b2114 100755 --- a/os-plugins/plugins/x11vnc/files/x11vnc-init +++ b/os-plugins/plugins/x11vnc/files/x11vnc-init @@ -16,14 +16,17 @@ find_xauth () { [ -e "/var/lib/kdm/" ] && XAUTHFILE_KDM=`find /var/lib/kdm/ -iname "A\:0-*"` + [ -e "/var/run/xauth/" ] && + XAUTHFILE_KDM2=`find /var/run/xauth/ -iname "A\:0-*"` [ -e "/var/lib/xdm/authdir/authfiles/" ] && XAUTHFILE_XDM=`find /var/lib/xdm/authdir/authfiles/ -iname "A\:0-*"` [ -e "/var/lib/gdm/" ] && XAUTHFILE_GDM=`find /var/lib/gdm/ -iname *Xauth*` - [ -f "$XAUTHFILE_KDM" ] && FOUND=1 && XAUTHORITY="$XAUTHFILE_KDM" - [ -f "$XAUTHFILE_XDM" ] && FOUND=1 && XAUTHORITY="$XAUTHFILE_XDM" - [ -f "$XAUTHFILE_GDM" ] && FOUND=1 && XAUTHORITY="$XAUTHFILE_GDM" + [ -f "$XAUTHFILE_KDM" ] && FOUND=1 && XAUTHORITY="$XAUTHFILE_KDM" + [ -f "$XAUTHFILE_KDM2" ] && FOUND=1 && XAUTHORITY="$XAUTHFILE_KDM2" + [ -f "$XAUTHFILE_XDM" ] && FOUND=1 && XAUTHORITY="$XAUTHFILE_XDM" + [ -f "$XAUTHFILE_GDM" ] && FOUND=1 && XAUTHORITY="$XAUTHFILE_GDM" if [ "$FOUND" -eq "0" ]; then if [ "$RETRIES" -gt "0" ]; then |