SecBSD/xenocara
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2025-01-10 01:40:29 +00:00
parent 4b49aefbb1
commit 1fd36b57f8
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
945 changed files with 81965 additions and 59988 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xserver/os/access.c
View file

@ -1864,7 +1864,7 @@ siHostnameAddrMatch(int family, void *addr, int len,
char hostname[SI_HOSTNAME_MAXLEN];
int f, hostaddrlen;
void *hostaddr;
const char **addrlist;
char **addrlist;
if (siAddrLen >= sizeof(hostname))
return FALSE;
@ -1889,7 +1889,9 @@ siHostnameAddrMatch(int family, void *addr, int len,
if ((f == family) && (len == hostaddrlen) &&
(memcmp(addr, hostaddr, len) == 0)) {
res = TRUE;
#ifdef h_addr
break;
#endif
}
}
}

7
xserver/os/client.c
View file

@ -136,7 +136,7 @@ DetermineClientPid(struct _Client * client)
void
DetermineClientCmd(pid_t pid, const char **cmdname, const char **cmdargs)
{
#if !defined(__APPLE__)
#if !defined(__APPLE__) && !defined(__OpenBSD__)
char path[PATH_MAX + 1];
int totsize = 0;
int fd = 0;
@ -269,10 +269,9 @@ DetermineClientCmd(pid_t pid, const char **cmdname, const char **cmdargs)
return;
argv = kvm_getargv(kd, kp, 0);
if (cmdname) {
if (argv == NULL || argv[0] == NULL) {
*cmdname = strdup("");
if (argv == NULL || argv[0] == NULL)
return;
} else
else
*cmdname = strdup(argv[0]);
}
if (cmdargs) {