midfavila
/
TinyX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

os/access: warning fixes

This commit is contained in:
Lauri Kasanen 2015-02-25 15:53:37 +02:00
parent 002cb02f4e
commit 257d4eee64
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/os.h
View File

@ -267,7 +267,7 @@ int ChangeAccessControl(ClientPtr /*client*/, int /*fEnabled*/);
void AddLocalHosts(void); void AddLocalHosts(void);
void ResetHosts(char *display); void ResetHosts(const char *display);
void EnableLocalHost(void); void EnableLocalHost(void);

11
os/access.c
View File

@ -660,7 +660,8 @@ DefineSelf (int fd)
if (!ifr->ifa_addr) if (!ifr->ifa_addr)
continue; continue;
len = sizeof(*(ifr->ifa_addr)); len = sizeof(*(ifr->ifa_addr));
family = ConvertAddr(ifr->ifa_addr, &len, (pointer *)&addr); family = ConvertAddr((struct sockaddr *) ifr->ifa_addr, &len,
(pointer *)&addr);
if (family == -1 || family == FamilyLocal) if (family == -1 || family == FamilyLocal)
continue; continue;
#if defined(IPv6) && defined(AF_INET6) #if defined(IPv6) && defined(AF_INET6)
@ -823,7 +824,7 @@ AddLocalHosts (void)
/* Reset access control list to initial hosts */ /* Reset access control list to initial hosts */
void void
ResetHosts (char *display) ResetHosts (const char *display)
{ {
HOST *host; HOST *host;
char lhostname[120], ohostname[120]; char lhostname[120], ohostname[120];
@ -843,7 +844,7 @@ ResetHosts (char *display)
} saddr; } saddr;
#endif #endif
int family = 0; int family = 0;
pointer addr; pointer addr = NULL;
int len; int len;
siTypesInitialize(); siTypesInitialize();
@ -1356,7 +1357,7 @@ InvalidHost (
ClientPtr client) ClientPtr client)
{ {
int family; int family;
pointer addr; pointer addr = NULL;
HOST *selfhost, *host; HOST *selfhost, *host;
if (!AccessEnabled) /* just let them in */ if (!AccessEnabled) /* just let them in */
@ -1636,7 +1637,7 @@ siHostnameAddrMatch(int family, pointer addr, int len,
struct addrinfo *addresses; struct addrinfo *addresses;
struct addrinfo *a; struct addrinfo *a;
int f, hostaddrlen; int f, hostaddrlen;
pointer hostaddr; pointer hostaddr = NULL;
if (siAddrLen >= sizeof(hostname)) if (siAddrLen >= sizeof(hostname))
return FALSE; return FALSE;