[BusyBox-cvs] busybox/loginutils login.c,1.15,1.16

Erik Andersen andersen at busybox.net
Mon Apr 12 22:49:08 UTC 2004


Update of /var/cvs/busybox/loginutils
In directory nail:/tmp/cvs-serv20775

Modified Files:
	login.c 
Log Message:
Sigh.  The patch from David Anders (prpplague) broke standard
securetty files since the /dev was not stripped.


Index: login.c
===================================================================
RCS file: /var/cvs/busybox/loginutils/login.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- a/login.c	15 Mar 2004 08:28:46 -0000	1.15
+++ b/login.c	12 Apr 2004 22:49:06 -0000	1.16
@@ -127,7 +127,9 @@
 #endif
 
 	tmp = ttyname ( 0 );
-	if ( tmp )
+	if ( tmp && ( strncmp ( tmp, "/dev/", 5 ) == 0 ))
+		safe_strncpy ( tty, tmp + 5, sizeof( tty ));
+	else if ( tmp && *tmp == '/' )
 		safe_strncpy ( tty, tmp, sizeof( tty ));
 	else
 		safe_strncpy ( tty, "UNKNOWN", sizeof( tty ));




More information about the busybox-cvs mailing list