summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-18 14:06:00 +0000
committerAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-18 14:06:00 +0000
commit26b36ab5d5adf7b982f8c4e17f35c105b0b9cd65 (patch)
tree9578c70a38827dafb3e2f05b8dbcc7c16729f550
parent4a836efd59f055a041b0e82645cae0f179f664cc (diff)
fix error from last merge
-rw-r--r--os/access.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/os/access.c b/os/access.c
index 324961ee1..c8e7afe9b 100644
--- a/os/access.c
+++ b/os/access.c
@@ -1,5 +1,5 @@
/* $Xorg: access.c,v 1.5 2001/02/09 02:05:23 xorgcvs Exp $ */
-/* $XdotOrg: xc/programs/Xserver/os/access.c,v 1.1.4.3.2.2 2004/03/17 17:39:36 alanc Exp $ */
+/* $XdotOrg: xc/programs/Xserver/os/access.c,v 1.1.4.2.2.4 2004/03/18 12:00:24 ago Exp $ */
/***********************************************************
Copyright 1987, 1998 The Open Group
@@ -2070,7 +2070,7 @@ siHostnameAddrMatch(int family, pointer addr, int len,
{
struct sockaddr_in sin;
- sin.sa_family = hp->h_addrtype;
+ sin.sin_family = hp->h_addrtype;
acopy ( *addrlist, &(sin.sin_addr), hp->h_length);
hostaddrlen = sizeof(sin);
f = ConvertAddr ((struct sockaddr *)&sin,
@@ -2081,7 +2081,7 @@ siHostnameAddrMatch(int family, pointer addr, int len,
break;
}
}
-
+ }
}
#endif
return res;