svn commit: samba r6144 - in branches/SAMBA_4_0/source/lib/socket_wrapper: .

[jelmer at samba.org]

Author: jelmer
Date: 2005-03-31 00:43:26 +0000 (Thu, 31 Mar 2005)
New Revision: 6144

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6144

Log:
Apparently there are more systems that have AF_UNIX then 
AF_LOCAL (we already use AF_UNIX in other places).

Modified:
   branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c
===================================================================
--- branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c	2005-03-31 00:37:01 UTC (rev 6143)
+++ branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c	2005-03-31 00:43:26 UTC (rev 6144)
@@ -129,12 +129,12 @@
 	if (!out_addr)
 		return 0;
 
-	out_addr->sun_family = AF_LOCAL;
+	out_addr->sun_family = AF_UNIX;
 
 	switch (in_addr->sa_family) {
 	case AF_INET:
 		return convert_in_un(si->type, (const struct sockaddr_in *)in_addr, out_addr);
-	case AF_LOCAL:
+	case AF_UNIX:
 		memcpy(out_addr, in_addr, sizeof(*out_addr));
 		return 0;
 	default:
@@ -157,7 +157,7 @@
 	switch (family) {
 	case AF_INET:
 		return convert_un_in(in_addr, (struct sockaddr_in *)out_addr, out_len);
-	case AF_LOCAL:
+	case AF_UNIX:
 		memcpy(out_addr, in_addr, sizeof(*in_addr));
 		*out_len = sizeof(*in_addr);
 		return 0;
@@ -178,7 +178,7 @@
 		return real_socket(domain, type, protocol);
 	}
 	
-	fd = real_socket(PF_LOCAL, type, 0);
+	fd = real_socket(AF_UNIX, type, 0);
 
 	if (fd < 0) 
 		return fd;
@@ -330,7 +330,7 @@
 	} 
 
 	switch (si->domain) {
-	case AF_LOCAL:
+	case AF_UNIX:
 		return real_getsockopt(s, level, optname, optval, optlen);
 	default:
 		errno = ENOPROTOOPT;
@@ -351,7 +351,7 @@
 	}
 
 	switch (si->domain) {
-	case AF_LOCAL:
+	case AF_UNIX:
 		return real_setsockopt(s, level, optname, optval, optlen);
 	case AF_INET:
 		/* Silence some warnings */