commit d01ba9898661052f1b8c154b5d457e85aec75b5f
author Ben Lindstrom <mouring@eviladmin.org> Sun Jul 22 20:36:57 2001 +0000
committer Ben Lindstrom <mouring@eviladmin.org> Sun Jul 22 20:36:57 2001 +0000
tree e821495c725a34f0c24148a57cc845cd729b5976
parent d9e0824b437bb4d65c1ae564b049e35c93e31010

 - OpenBSD CVS Sync
   - markus@cvs.openbsd.org 2001/07/18 21:10:43
     [sshpty.c]
     pr #1946, allow sshd if /dev is readonly

sshpty.c

diff --git a/sshpty.c b/sshpty.c
index 4083e24..6f97f38 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -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 @@
 
 	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));