From 264c6117223b7c68d342ab881d1c718dd008a79f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 22 Jan 2012 00:15:07 -0600 Subject: Part 1 of 2 of kdm rename --- etc/smartauth/smartauthmon.sh.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'etc/smartauth') diff --git a/etc/smartauth/smartauthmon.sh.in b/etc/smartauth/smartauthmon.sh.in index a307ec9..f1d9e71 100644 --- a/etc/smartauth/smartauthmon.sh.in +++ b/etc/smartauth/smartauthmon.sh.in @@ -293,7 +293,7 @@ while [[ 1 == 1 ]]; do waserror=0 noactivesessions=0 - $result=$(/opt/trinity/bin/kdmctl -g list) + $result=$(/opt/trinity/bin/tdmctl -g list) if [[ $result == "ok" ]]; then noactivesessions=1 result="okbutempty" @@ -302,7 +302,7 @@ while [[ 1 == 1 ]]; do resultbkp=$result if [[ $errcode -eq 0 ]]; then - # Allow KDM to finish starting + # Allow TDM to finish starting if [[ $waserror -eq 1 ]]; then sleep 10 fi @@ -360,7 +360,7 @@ while [[ 1 == 1 ]]; do if [[ $lverify == $cverify ]]; then su $smartcard_username -c "export DISPLAY=$udisplay; /opt/trinity/bin/dcop kdesktop KScreensaverIface quit" su $smartcard_username -c "export DISPLAY=$udisplay; /opt/trinity/bin/dcop kdesktop KScreensaverIface enable false" - /opt/trinity/bin/kdmctl activate $udisplay + /opt/trinity/bin/tdmctl activate $udisplay else echo "EUnauthorized SmartCard Inserted" > /tmp/ksocket-global/kdesktoplockcontrol & fi @@ -427,10 +427,10 @@ while [[ 1 == 1 ]]; do echo "The next display to start will be $newdisplay" rm $SECURE_DIRECTORY/originalxdm - /opt/trinity/bin/kdmctl -g reserve - /opt/trinity/bin/kdmctl -g login $newdisplay now $smartcard_username $(cat $SECURE_DIRECTORY/password) + /opt/trinity/bin/tdmctl -g reserve + /opt/trinity/bin/tdmctl -g login $newdisplay now $smartcard_username $(cat $SECURE_DIRECTORY/password) sleep 2 - /opt/trinity/bin/kdmctl -g activate $newdisplay + /opt/trinity/bin/tdmctl -g activate $newdisplay udisplay=$newdisplay fi @@ -497,7 +497,7 @@ while [[ 1 == 1 ]]; do result="ok" timeout=0 errcode=0 - $result=$(/opt/trinity/bin/kdmctl -g list) + $result=$(/opt/trinity/bin/tdmctl -g list) if [[ $result == "ok" ]]; then noactivesessions=1 result="okbutempty" @@ -553,7 +553,7 @@ while [[ 1 == 1 ]]; do timeout=0 blankresult="" while [[ $blankresult != "true" ]]; do - /opt/trinity/bin/kdmctl -g activate $udisplay + /opt/trinity/bin/tdmctl -g activate $udisplay su $smartcard_username -c "export DISPLAY=$udisplay; /opt/trinity/bin/dcop kdesktop KScreensaverIface enable true" su $smartcard_username -c "export DISPLAY=$udisplay; /opt/trinity/bin/dcop kdesktop KScreensaverIface lock" blankresult=$(su $smartcard_username -c "export DISPLAY=$udisplay; /opt/trinity/bin/dcop kdesktop KScreensaverIface isBlanked") -- cgit v1.2.1