diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-10-18 03:30:02 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-10-18 03:30:02 +0000 |
| commit | d0279ead6f0285df05ec04606529a2db78c75207 (patch) | |
| tree | de11e69635bc168c39b02b2d9cacabdecb061c8b /sys/kern | |
| parent | ef0048419ec8f789e17a23ab6946a350fcc5c2ee (diff) | |
Move your drink further away... When a program pledged "getpw" fails to
get a response from a YP server, it will open "/dev/tty" and spit out:
'YP server for domain %s not responding, still trying'
For now allow open of /dev/tty for "getpw". I hope to re-architect the
libc:YP communication protocol (strategy similar to syslog->sendsyslog,
isatty->fcntl, dnssocket/dnsconnect) and then we can reevaluate this.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_pledge.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c index 3d1fa59be00..2c1b209b299 100644 --- a/sys/kern/kern_pledge.c +++ b/sys/kern/kern_pledge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_pledge.c,v 1.51 2015/10/18 01:53:31 deraadt Exp $ */ +/* $OpenBSD: kern_pledge.c,v 1.52 2015/10/18 03:30:01 deraadt Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org> @@ -575,6 +575,12 @@ pledge_namei(struct proc *p, char *origpath) return (0); } + /* "YP server for domain %s not responding, still trying" */ + if ((p->p_p->ps_pledge & PLEDGE_GETPW) && + (p->p_pledgenote & ~(TMN_RPATH | TMN_WPATH)) == 0 && + strcmp(path, "/dev/tty") == 0) { + return (0); + /* DNS needs /etc/{resolv.conf,hosts,services}. */ if ((p->p_pledgenote == TMN_RPATH) && (p->p_p->ps_pledge & PLEDGE_DNS)) { @@ -585,6 +591,7 @@ pledge_namei(struct proc *p, char *origpath) if (strcmp(path, "/etc/services") == 0) return (0); } + if ((p->p_pledgenote == TMN_RPATH) && (p->p_p->ps_pledge & PLEDGE_GETPW)) { if (strcmp(path, "/var/run/ypbind.lock") == 0) { @@ -595,6 +602,7 @@ pledge_namei(struct proc *p, char *origpath) sizeof("/var/yp/binding/") - 1) == 0) return (0); } + /* tzset() needs these. */ if ((p->p_pledgenote == TMN_RPATH) && strncmp(path, "/usr/share/zoneinfo/", |