Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Move the xauth command back within the xserver session, and turn on t…

…he SECURITY extension for the xserver
  • Loading branch information...
commit 5c669f079715a78b4b8cacb684eb5b6eebb92808 1 parent d5549e0
@beanpole135 beanpole135 authored
Showing with 3 additions and 6 deletions.
  1. +1 −4 src-qt4/PCDM/PCDMd
  2. +2 −2 src-qt4/PCDM/src/main.cpp
View
5 src-qt4/PCDM/PCDMd
@@ -45,8 +45,5 @@ while [ ! -e /var/run/nologin ]; do
# Start VNC
(sleep 10 ; $vnccmd >/var/log/vncserver 2>/var/log/vncserver) &
fi
- setenv XAUTHORITY ${PCDMAUTHFILE}
- xauth -f ${PCDMAUTHFILE} generate :0 .
- xinit /usr/local/bin/PCDM-session --once -- :0 -auth ${PCDMAUTHFILE} $XOPTS
- xauth -f ${PCDMAUTHFILE} remove :0
+ xinit /usr/local/bin/PCDM-session --once -- :0 -x SECURITY -auth ${PCDMAUTHFILE} $XOPTS
done
View
4 src-qt4/PCDM/src/main.cpp
@@ -172,7 +172,7 @@ int main(int argc, char *argv[])
while(neverquit){
if(runonce){ neverquit = FALSE; }
qDebug() << " -- PCDM Session Starting...";
- //system("xauth -f "+TMPAUTHFILE.toUtf8()+" generate :0 ."); //Using MIT-MAGIC-COOKIE-1 protocol
+ system("xauth -f "+TMPAUTHFILE.toUtf8()+" generate :0 ."); //Using MIT-MAGIC-COOKIE-1 protocol
//MIT-MAGIC-COOKIE-1 is good enough for our purposes since it is a single-user graphical system with no XDMCP
int sid = -1;
int pid = fork();
@@ -199,6 +199,6 @@ int main(int argc, char *argv[])
qDebug() << "-- PCDM Session Ended --";
if(QFile::exists("/var/run/nologin")){ neverquit = FALSE; }
}
- //system("xauth -f "+TMPAUTHFILE.toUtf8()+" remove :0");
+ system("xauth -f "+TMPAUTHFILE.toUtf8()+" remove :0");
return 0;
}
Please sign in to comment.
Something went wrong with that request. Please try again.