From d6dc3576e259ae3156b26de24c8feb7d9e9b9f8a Mon Sep 17 00:00:00 2001 From: djm Date: Mon, 24 Feb 2003 00:54:10 +0000 Subject: [PATCH] - markus@cvs.openbsd.org 2003/02/03 08:56:16 [sshpty.c] don't call error() for readonly /dev; from soekris list; ok mcbride, henning, deraadt. --- ChangeLog | 4 ++++ sshpty.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3175e998..c2846ea0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,10 @@ [kex.c] add support for key exchange guesses; based on work by avraham.fraenkel@commatch.com; fixes bug #148; ok deraadt@ + - markus@cvs.openbsd.org 2003/02/03 08:56:16 + [sshpty.c] + don't call error() for readonly /dev; from soekris list; ok mcbride, + henning, deraadt. 20030211 - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com diff --git a/sshpty.c b/sshpty.c index 28d0e310..d28947f6 100644 --- a/sshpty.c +++ b/sshpty.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshpty.c,v 1.7 2002/06/24 17:57:20 deraadt Exp $"); +RCSID("$OpenBSD: sshpty.c,v 1.8 2003/02/03 08:56:16 markus Exp $"); #ifdef HAVE_UTIL_H # include @@ -394,7 +394,7 @@ pty_setowner(struct passwd *pw, const char *ttyname) if (chown(ttyname, pw->pw_uid, gid) < 0) { if (errno == EROFS && (st.st_uid == pw->pw_uid || st.st_uid == 0)) - error("chown(%.100s, %u, %u) failed: %.100s", + debug("chown(%.100s, %u, %u) failed: %.100s", ttyname, (u_int)pw->pw_uid, (u_int)gid, strerror(errno)); else @@ -408,7 +408,7 @@ pty_setowner(struct passwd *pw, const char *ttyname) if (chmod(ttyname, mode) < 0) { if (errno == EROFS && (st.st_mode & (S_IRGRP | S_IROTH)) == 0) - error("chmod(%.100s, 0%o) failed: %.100s", + debug("chmod(%.100s, 0%o) failed: %.100s", ttyname, mode, strerror(errno)); else fatal("chmod(%.100s, 0%o) failed: %.100s", -- 2.45.1