qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bring fix from rev 1.12 back once more. ok oga@.

Browse Source
This commit is contained in:
matthieu 2010-12-22 21:36:05 +00:00
parent cc84c83945
commit 55b9b068ae
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xserver/os/privsep.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: privsep.c,v 1.15 2010/12/05 15:36:10 matthieu Exp $ */
/* $OpenBSD: privsep.c,v 1.16 2010/12/22 21:36:05 matthieu Exp $ */
/*
* Copyright 2001 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@ -299,14 +299,21 @@ int
priv_open_device(const char *path)
{
priv_cmd_t cmd;
struct okdev *dev;
if (priv_fd != -1) {
cmd.cmd = PRIV_OPEN_DEVICE;
strlcpy(cmd.arg.open.path, path, MAXPATHLEN);
write(priv_fd, &cmd, sizeof(cmd));
return receive_fd(priv_fd);
} else
return open(path, O_RDWR | O_NONBLOCK | O_EXCL);
} else {
if ((dev = open_ok(path)) != NULL)
return open(path, dev->flags);
else {
errno = EPERM;
return -1;
}
}
}
/* send signal to parent process */