Rename ksocket and kcache

2 files changed, 13 insertions, 13 deletions

diff --git a/etc/smartauth/smartauthmon.sh.in b/etc/smartauth/smartauthmon.sh.in
index f1d9e71..ebf360a 100644
--- a/etc/smartauth/smartauthmon.sh.in
+++ b/etc/smartauth/smartauthmon.sh.in
@@ -136,7 +136,7 @@ while [[ 1 == 1 ]]; do
 	OUTPUT=$?
 	if [[ $OUTPUT -eq 0 ]]; then
 		echo "Card inserted!"
-		echo "TAuthenticating SmartCard..." > /tmp/ksocket-global/kdesktoplockcontrol &
+		echo "TAuthenticating SmartCard..." > /tmp/tdesocket-global/kdesktoplockcontrol &
 
 		# Get card ATR
 		echo "RESET" > $SECURE_DIRECTORY/query
@@ -252,7 +252,7 @@ while [[ 1 == 1 ]]; do
 			fi
 		else
 			echo "This card does not recognize this system!"
-			echo "EInvalid SmartCard Inserted" > /tmp/ksocket-global/kdesktoplockcontrol &
+			echo "EInvalid SmartCard Inserted" > /tmp/tdesocket-global/kdesktoplockcontrol &
 			sleep 1
 			smartcard_username=""
 			rm -f $SECURE_DIRECTORY/password
@@ -362,7 +362,7 @@ while [[ 1 == 1 ]]; do
 							su $smartcard_username -c "export DISPLAY=$udisplay; /opt/trinity/bin/dcop kdesktop KScreensaverIface enable false"
 							/opt/trinity/bin/tdmctl activate $udisplay
 						else
-							echo "EUnauthorized SmartCard Inserted" > /tmp/ksocket-global/kdesktoplockcontrol &
+							echo "EUnauthorized SmartCard Inserted" > /tmp/tdesocket-global/kdesktoplockcontrol &
 						fi
 					else
 						echo "Username not specified"
@@ -444,7 +444,7 @@ while [[ 1 == 1 ]]; do
 	
 			#if [[ loginok -eq 1 ]]; then
 				# Wait for SmartCard removal
-				echo "C" > /tmp/ksocket-global/kdesktoplockcontrol &
+				echo "C" > /tmp/tdesocket-global/kdesktoplockcontrol &
 				TIMER=60
 				OUTPUT=0
 				
@@ -578,6 +578,6 @@ while [[ 1 == 1 ]]; do
 
 		smartcard_username=""
 		rm -rf /etc/smartmon/minutesremaining
-		echo "C" > /tmp/ksocket-global/kdesktoplockcontrol &
+		echo "C" > /tmp/tdesocket-global/kdesktoplockcontrol &
 	fi
 done
diff --git a/src/smartauthmon.cpp b/src/smartauthmon.cpp
index eec2776..1386c30 100644
--- a/src/smartauthmon.cpp
+++ b/src/smartauthmon.cpp
@@ -47,9 +47,9 @@
 // Some internal constants
 #define CREATE_LIFE_CYCLE "01"
 
-#define TDM_CONTROL_FIFO_DIR "/tmp/ksocket-global/tdm"
-#define TDM_CONTROL_FIFO_FILE "/tmp/ksocket-global/tdm/tdmctl-%1"
-#define TDM_CONTROL_FIFO_SAK_FILE "/tmp/ksocket-global/tdm/tdmctl-sak-%1"
+#define TDM_CONTROL_FIFO_DIR "/tmp/tdesocket-global/tdm"
+#define TDM_CONTROL_FIFO_FILE "/tmp/tdesocket-global/tdm/tdmctl-%1"
+#define TDM_CONTROL_FIFO_SAK_FILE "/tmp/tdesocket-global/tdm/tdmctl-sak-%1"
 
 // In ckpass.o
 extern "C" {
@@ -362,7 +362,7 @@ int main (int argc, char *argv[])
 		int output = systemexec("echo \"exit\" | timeout 1 scriptor 2>/dev/null 1>/dev/null");
 		if (output == 0) {
 			printf("[DEBUG 400.1] Card inserted!\n\r"); fflush(stdout);
-			systemexec("echo \"TAuthenticating SmartCard...\" > /tmp/ksocket-global/kdesktoplockcontrol &");
+			systemexec("echo \"TAuthenticating SmartCard...\" > /tmp/tdesocket-global/kdesktoplockcontrol &");
 	
 			// Get card ATR
 			systemexec((TQString("echo \"RESET\" > %1/query").arg(secure_directory)).ascii());
@@ -494,7 +494,7 @@ int main (int argc, char *argv[])
 			}
 			else {
 				printf("[DEBUG 400.7] This card does not recognize this system!\n\r"); fflush(stdout);
-				systemexec("echo \"EInvalid SmartCard Inserted\" > /tmp/ksocket-global/kdesktoplockcontrol &");
+				systemexec("echo \"EInvalid SmartCard Inserted\" > /tmp/tdesocket-global/kdesktoplockcontrol &");
 				sleep(1);
 				smartcard_username="";
 				unlink((TQString("%1/password").arg(secure_directory)).ascii());
@@ -585,7 +585,7 @@ int main (int argc, char *argv[])
 								systemexec((TQString(TRINITY_BIN_PREFIX "tdmctl activate %1").arg(udisplay)).ascii());
 							}
 							else {
-								systemexec("echo \"EUnauthorized SmartCard Inserted\" > /tmp/ksocket-global/kdesktoplockcontrol &");
+								systemexec("echo \"EUnauthorized SmartCard Inserted\" > /tmp/tdesocket-global/kdesktoplockcontrol &");
 							}
 						}
 						else {
@@ -713,7 +713,7 @@ int main (int argc, char *argv[])
 		
 				// if (loginok == 1) {
 					// Wait for SmartCard removal
-					systemexec("echo \"C\" > /tmp/ksocket-global/kdesktoplockcontrol &");
+					systemexec("echo \"C\" > /tmp/tdesocket-global/kdesktoplockcontrol &");
 					timer=60;
 					output=0;
 					
@@ -833,7 +833,7 @@ int main (int argc, char *argv[])
 	
 			smartcard_username="";
 			unlink("/etc/smartmon/minutesremaining");
-			systemexec("echo \"C\" > /tmp/ksocket-global/kdesktoplockcontrol &");
+			systemexec("echo \"C\" > /tmp/tdesocket-global/kdesktoplockcontrol &");
 		}
 	}
 }