[Pcsclite-cvs-commit] r7026 - trunk/PCSC/src

ludovic.rousseau at free.fr ludovic.rousseau at free.fr
Thu Nov 6 09:08:07 UTC 2014


Author: rousseau
Date: 2014-11-06 09:08:07 +0000 (Thu, 06 Nov 2014)
New Revision: 7026

Modified:
   trunk/PCSC/src/pcscdaemon.c
Log:
Do not log an error when pcscd is started by systemd

If pcscd is started by systemd then /var/run/pcscd/pcscd.comm exists but
/var/run/pcscd/pcscd.pid do not exists yet. So an error was logged:
pcscd[2536]: 00000000 utils.c:87:GetDaemonPid() Can't open /var/run/pcscd/pcscd.pid: No such file or directory

Now /var/run/pcscd/pcscd.pid is used only if pcscd is NOT started by
systemd.

Close Alioth bug [#314862] Should not log an error Can't open /var/run/pcscd/pcscd.pid when started by systemd
https://alioth.debian.org/tracker/index.php?func=detail&aid=314862&group_id=30105&atid=410085


Modified: trunk/PCSC/src/pcscdaemon.c
===================================================================
--- trunk/PCSC/src/pcscdaemon.c	2014-11-05 19:32:42 UTC (rev 7025)
+++ trunk/PCSC/src/pcscdaemon.c	2014-11-06 09:08:07 UTC (rev 7026)
@@ -381,7 +381,8 @@
 
 	rv = stat(PCSCLITE_CSOCK_NAME, &fStatBuf);
 
-	if (rv == 0)
+	/* if the file exist and pcscd was _not_ started by systemd */
+	if (rv == 0 && !SocketActivated)
 	{
 		pid_t pid;
 




More information about the Pcsclite-cvs-commit mailing list