Permalink
Browse files

Remove the Xau stuff that I was playing with earlier. This should let…

… PCDM compile again... :-)
  • Loading branch information...
1 parent b3ebed5 commit 1691c6a80fa15af05b84bd715a0750834ed5d7fe Ken Moore committed Oct 29, 2013
Showing with 2 additions and 28 deletions.
  1. +2 −1 src-qt4/PCDM/PCDMd
  2. +0 −20 src-qt4/PCDM/src/pcdm-xprocess.cpp
  3. +0 −7 src-qt4/PCDM/src/pcdm-xprocess.h
View
@@ -4,6 +4,7 @@
#------------------------------------
PCDMCONF="/usr/local/etc/pcdm.conf"
+PCDMAUTHFILE="/tmp/.PCDMAuth"
XOPTS=""
grep -q "^ENABLE_TCP_LISTEN=TRUE" ${PCDMCONF}
@@ -43,5 +44,5 @@ while [ ! -e /var/run/nologin ]; do
(sleep 10 ; $vnccmd >/var/log/vncserver 2>/var/log/vncserver) &
fi
- xinit /usr/local/bin/PCDM-session --once -- :0 $XOPTS
+ xinit /usr/local/bin/PCDM-session --once -- :0 -auth ${PCDMAUTHFILE} $XOPTS
done
@@ -406,23 +406,3 @@ void XProcess::pam_shutdown(){
pam_started = FALSE;
}
}
-// -------------------------------------------
-// XAUTHORITY FUNCTIONS
-// -------------------------------------------
-void XProcess::generateXAuth(){
- //determine the filename
- XAUTHFILENAME = XauFileName();
- //generate the structure
- XAUTH = new Xauth;
- XAUTH->
- //open the file (as new)
- FILE *XFILE = fopen( XAUTHFILENAME, "w+" );
- //Write the authorization file
- XauWriteAuth( XFILE, XAUTH );
- //Now close the file
- fclose(XFILE);
-}
-
-void XProcess::revokeXAuth(){
-
-}
@@ -22,8 +22,6 @@
#include "pcdm-backend.h"
-#include <X11/Xauth.h>
-
class XProcess : public QProcess
{
Q_OBJECT
@@ -56,11 +54,6 @@ class XProcess : public QProcess
bool pam_stopSession();
void pam_logFailure(int);
void pam_shutdown(); //cleanly close all the PAM stuff
- // XAuthoriy functions
- Xauth XAUTH; //saved authority structure
- char *XAUTHFILENAME; //file location for the authority file
- void generateXAuth();
- void revokeXAuth();
private slots:

0 comments on commit 1691c6a

Please sign in to comment.