- OpenBSD CVS Sync
- markus@cvs.openbsd.org 2001/07/18 21:10:43 [sshpty.c] pr #1946, allow sshd if /dev is readonly
This commit is contained in:
parent
d9e0824b43
commit
d01ba98986
|
@ -4,6 +4,10 @@
|
||||||
Added openbsd-compat/bsd-cray.c. Rest will be merged after
|
Added openbsd-compat/bsd-cray.c. Rest will be merged after
|
||||||
approval. Selective patches from William L. Jones
|
approval. Selective patches from William L. Jones
|
||||||
<jones@mail.utexas.edu>
|
<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
|
20010719
|
||||||
- (tim) [configure.in] put inet_aton back in AC_CHECK_FUNCS.
|
- (tim) [configure.in] put inet_aton back in AC_CHECK_FUNCS.
|
||||||
|
@ -6077,4 +6081,4 @@
|
||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- 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 $
|
||||||
|
|
5
sshpty.c
5
sshpty.c
|
@ -12,7 +12,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#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
|
#ifdef HAVE_UTIL_H
|
||||||
# include <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 (st.st_uid != pw->pw_uid || st.st_gid != gid) {
|
||||||
if (chown(ttyname, pw->pw_uid, gid) < 0) {
|
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",
|
error("chown(%.100s, %d, %d) failed: %.100s",
|
||||||
ttyname, pw->pw_uid, gid,
|
ttyname, pw->pw_uid, gid,
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
|
|
Loading…
Reference in New Issue