===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshpty.c,v
retrieving revision 1.1.6.2
retrieving revision 1.2
diff -u -r1.1.6.2 -r1.2
--- src/usr.bin/ssh/sshpty.c	2002/03/09 00:20:45	1.1.6.2
+++ src/usr.bin/ssh/sshpty.c	2001/07/18 21:10:43	1.2
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshpty.c,v 1.1.6.2 2002/03/09 00:20:45 miod Exp $");
+RCSID("$OpenBSD: sshpty.c,v 1.2 2001/07/18 21:10:43 markus Exp $");
 
 #include <util.h>
 #include "sshpty.h"
@@ -131,7 +131,7 @@
 	*ttyfd = open(name, O_RDWR | O_NOCTTY);
 	if (*ttyfd < 0) {
 		error("Could not open pty slave side %.100s: %.100s",
-		    name, strerror(errno));
+		      name, strerror(errno));
 		close(*ptyfd);
 		return 0;
 	}
@@ -224,7 +224,7 @@
 	fd = open(_PATH_TTY, O_WRONLY);
 	if (fd < 0)
 		error("open /dev/tty failed - could not set controlling tty: %.100s",
-		    strerror(errno));
+		      strerror(errno));
 	else {
 		close(fd);
 	}
@@ -234,7 +234,7 @@
 
 void
 pty_change_window_size(int ptyfd, int row, int col,
-	int xpixel, int ypixel)
+		       int xpixel, int ypixel)
 {
 	struct winsize w;
 	w.ws_row = row;
@@ -264,8 +264,7 @@
 
 	/*
 	 * Change owner and mode of the tty as required.
-	 * Warn but continue if filesystem is read-only and the uids match/
-	 * tty is owned by root.
+	 * Warn but continue if filesystem is read-only and the uids match.
 	 */
 	if (stat(ttyname, &st))
 		fatal("stat(%.100s) failed: %.100s", ttyname,
@@ -273,15 +272,15 @@
 
 	if (st.st_uid != pw->pw_uid || st.st_gid != gid) {
 		if (chown(ttyname, pw->pw_uid, gid) < 0) {
-			if (errno == EROFS &&
+			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));
+				      ttyname, pw->pw_uid, gid,
+				      strerror(errno));
 			else
 				fatal("chown(%.100s, %d, %d) failed: %.100s",
-				    ttyname, pw->pw_uid, gid,
-				    strerror(errno));
+				      ttyname, pw->pw_uid, gid,
+				      strerror(errno));
 		}
 	}
 
@@ -290,10 +289,10 @@
 			if (errno == EROFS &&
 			    (st.st_mode & (S_IRGRP | S_IROTH)) == 0)
 				error("chmod(%.100s, 0%o) failed: %.100s",
-				    ttyname, mode, strerror(errno));
+				      ttyname, mode, strerror(errno));
 			else
 				fatal("chmod(%.100s, 0%o) failed: %.100s",
-				    ttyname, mode, strerror(errno));
+				      ttyname, mode, strerror(errno));
 		}
 	}
 }