diff options
author | mouring <mouring> | 2001-07-22 20:36:57 +0000 |
---|---|---|
committer | mouring <mouring> | 2001-07-22 20:36:57 +0000 |
commit | f278c910d7ef6eeaa2f5b6253bc60bda2729f305 (patch) | |
tree | 1353805a9295e4d66ac105ba6ee46bc98451c691 | |
parent | 0354e2646e59b3ec5ccce8db8d250833727fb77b (diff) | |
download | openssh-f278c910d7ef6eeaa2f5b6253bc60bda2729f305.tar.gz |
- OpenBSD CVS Sync
- markus@cvs.openbsd.org 2001/07/18 21:10:43
[sshpty.c]
pr #1946, allow sshd if /dev is readonly
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sshpty.c | 5 |
2 files changed, 8 insertions, 3 deletions
@@ -4,6 +4,10 @@ Added openbsd-compat/bsd-cray.c. Rest will be merged after approval. Selective patches from William L. Jones <jones@mail.utexas.edu> + - OpenBSD CVS Sync + - markus@cvs.openbsd.org 2001/07/18 21:10:43 + [sshpty.c] + pr #1946, allow sshd if /dev is readonly 20010719 - (tim) [configure.in] put inet_aton back in AC_CHECK_FUNCS. @@ -6077,4 +6081,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1416 2001/07/22 19:32:00 mouring Exp $ +$Id: ChangeLog,v 1.1417 2001/07/22 20:36:57 mouring Exp $ @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshpty.c,v 1.1 2001/03/04 01:46:30 djm Exp $"); +RCSID("$OpenBSD: sshpty.c,v 1.2 2001/07/18 21:10:43 markus Exp $"); #ifdef HAVE_UTIL_H # include <util.h> @@ -321,7 +321,8 @@ pty_setowner(struct passwd *pw, const char *ttyname) if (st.st_uid != pw->pw_uid || st.st_gid != gid) { if (chown(ttyname, pw->pw_uid, gid) < 0) { - if (errno == EROFS && st.st_uid == pw->pw_uid) + if (errno == EROFS && + (st.st_uid == pw->pw_uid || st.st_uid == 0)) error("chown(%.100s, %d, %d) failed: %.100s", ttyname, pw->pw_uid, gid, strerror(errno)); |