summaryrefslogtreecommitdiff
path: root/sshpty.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-02-24 11:54:10 +1100
committerDamien Miller <djm@mindrot.org>2003-02-24 11:54:10 +1100
commite8cea9e7553aa7df59608c0ae7a5a8dcbcde95a6 (patch)
tree04386768afa219c5b5e5a173989670c2a78dd393 /sshpty.c
parentbabb47a059148bb97de254f8964dffe7dab213dc (diff)
- 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.
Diffstat (limited to 'sshpty.c')
-rw-r--r--sshpty.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sshpty.c b/sshpty.c
index 28d0e310c..d28947f62 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: sshpty.c,v 1.7 2002/06/24 17:57:20 deraadt Exp $"); 15RCSID("$OpenBSD: sshpty.c,v 1.8 2003/02/03 08:56:16 markus Exp $");
16 16
17#ifdef HAVE_UTIL_H 17#ifdef HAVE_UTIL_H
18# include <util.h> 18# include <util.h>
@@ -394,7 +394,7 @@ pty_setowner(struct passwd *pw, const char *ttyname)
394 if (chown(ttyname, pw->pw_uid, gid) < 0) { 394 if (chown(ttyname, pw->pw_uid, gid) < 0) {
395 if (errno == EROFS && 395 if (errno == EROFS &&
396 (st.st_uid == pw->pw_uid || st.st_uid == 0)) 396 (st.st_uid == pw->pw_uid || st.st_uid == 0))
397 error("chown(%.100s, %u, %u) failed: %.100s", 397 debug("chown(%.100s, %u, %u) failed: %.100s",
398 ttyname, (u_int)pw->pw_uid, (u_int)gid, 398 ttyname, (u_int)pw->pw_uid, (u_int)gid,
399 strerror(errno)); 399 strerror(errno));
400 else 400 else
@@ -408,7 +408,7 @@ pty_setowner(struct passwd *pw, const char *ttyname)
408 if (chmod(ttyname, mode) < 0) { 408 if (chmod(ttyname, mode) < 0) {
409 if (errno == EROFS && 409 if (errno == EROFS &&
410 (st.st_mode & (S_IRGRP | S_IROTH)) == 0) 410 (st.st_mode & (S_IRGRP | S_IROTH)) == 0)
411 error("chmod(%.100s, 0%o) failed: %.100s", 411 debug("chmod(%.100s, 0%o) failed: %.100s",
412 ttyname, mode, strerror(errno)); 412 ttyname, mode, strerror(errno));
413 else 413 else
414 fatal("chmod(%.100s, 0%o) failed: %.100s", 414 fatal("chmod(%.100s, 0%o) failed: %.100s",