[Pcsclite-cvs-commit] r6072 - /trunk/PCSC/src/pcscdaemon.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Mon Oct 24 12:06:05 2011
New Revision: 6072

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=6072
Log:
main(): do not fail if pcscd.comm is already present but pcscd.pid is
not present.

This is the case if pcscd has been configured in systemd but has been
stoped. When launched by hand (for a debug session for example) the
pcscd.comm file is still present but not used anymore.

The pcscd.comm file will be removed when pcscd manually started will
exit but the file will be recreated by "systemctl start pcscd.service"

Modified:
    trunk/PCSC/src/pcscdaemon.c

Modified: trunk/PCSC/src/pcscdaemon.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/pcscdaemon.c?rev=6072&op=diff
==============================================================================
--- trunk/PCSC/src/pcscdaemon.c (original)
+++ trunk/PCSC/src/pcscdaemon.c Mon Oct 24 12:06:05 2011
@@ -385,20 +385,6 @@
 			{
 				Log1(PCSC_LOG_CRITICAL, "file " PCSCLITE_RUN_PID " do not exist");
 				Log1(PCSC_LOG_CRITICAL, "Hotplug failed");
-				return EXIT_FAILURE;
-			}
-
-			if (!SocketActivated)
-			{
-				Log1(PCSC_LOG_CRITICAL,
-					"file " PCSCLITE_CSOCK_NAME " already exists.");
-				Log1(PCSC_LOG_CRITICAL,
-					"Maybe another pcscd is running?");
-				Log1(PCSC_LOG_CRITICAL,
-					"I can't read process pid from " PCSCLITE_RUN_PID);
-				Log1(PCSC_LOG_CRITICAL, "Remove " PCSCLITE_CSOCK_NAME);
-				Log1(PCSC_LOG_CRITICAL,
-					"if pcscd is not running to clear this message.");
 				return EXIT_FAILURE;
 			}
 		}