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