[Pcsclite-cvs-commit] r4530 - in /trunk/PCSC/src: winscard_msg.c winscard_msg_srv.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Thu Nov  5 07:54:12 2009
New Revision: 4530

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=4530
Log:
Revert change in revision 4395. Solaris does not have (Posix) AF_LOCAL

Thanks to Douglas E. Engert for the bug report
http://archives.neohapsis.com/archives/dev/muscle/2009-q4/0038.html

Modified:
    trunk/PCSC/src/winscard_msg.c
    trunk/PCSC/src/winscard_msg_srv.c

Modified: trunk/PCSC/src/winscard_msg.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_msg.c?rev=4530&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_msg.c (original)
+++ trunk/PCSC/src/winscard_msg.c Thu Nov  5 07:54:12 2009
@@ -62,7 +62,7 @@
 	int one;
 	int ret;
 
-	ret = socket(AF_LOCAL, SOCK_STREAM, 0);
+	ret = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (ret < 0)
 	{
 		Log2(PCSC_LOG_CRITICAL, "Error: create on client socket: %s",
@@ -71,7 +71,7 @@
 	}
 	*pdwClientID = ret;
 
-	svc_addr.sun_family = AF_LOCAL;
+	svc_addr.sun_family = AF_UNIX;
 	strncpy(svc_addr.sun_path, PCSCLITE_CSOCK_NAME,
 		sizeof(svc_addr.sun_path));
 

Modified: trunk/PCSC/src/winscard_msg_srv.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_msg_srv.c?rev=4530&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_msg_srv.c (original)
+++ trunk/PCSC/src/winscard_msg_srv.c Thu Nov  5 07:54:12 2009
@@ -102,14 +102,14 @@
 	/*
 	 * Create the common shared connection socket
 	 */
-	if ((commonSocket = socket(AF_LOCAL, SOCK_STREAM, 0)) < 0)
+	if ((commonSocket = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
 	{
 		Log2(PCSC_LOG_CRITICAL, "Unable to create common socket: %s",
 			strerror(errno));
 		return -1;
 	}
 
-	serv_adr.sun_family = AF_LOCAL;
+	serv_adr.sun_family = AF_UNIX;
 	strncpy(serv_adr.sun_path, PCSCLITE_CSOCK_NAME,
 		sizeof(serv_adr.sun_path));
 	(void)SYS_RemoveFile(PCSCLITE_CSOCK_NAME);