X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Ftty.c;h=4bac6484f4e063a49af6994090a9af6f74b25c68;hb=0f9a7931d88adb8df9d962997c7cd92969f1d80d;hp=d6026981613a67e736062e4f30a7cd50ed52e822;hpb=c85f525a3b84b2c65c3c74885997c3b7f9f411d1;p=ppp.git

diff --git a/pppd/tty.c b/pppd/tty.c
index d602698..4bac648 100644
--- a/pppd/tty.c
+++ b/pppd/tty.c
@@ -73,7 +73,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define RCSID	"$Id: tty.c,v 1.13 2004/01/13 04:17:59 paulus Exp $"
+#define RCSID	"$Id: tty.c,v 1.16 2004/10/28 00:16:37 paulus Exp $"
 
 #include <stdio.h>
 #include <ctype.h>
@@ -300,7 +300,7 @@ setdevname(cp, argv, doit)
 	if (*cp == 0)
 		return 0;
 
-	if (strncmp("/dev/", cp, 5) != 0) {
+	if (*cp != '/') {
 		strlcpy(dev, "/dev/", sizeof(dev));
 		strlcat(dev, cp, sizeof(dev));
 		cp = dev;
@@ -512,7 +512,9 @@ int connect_tty()
 {
 	char *connector;
 	int fdflags;
+#ifndef __linux__
 	struct stat statbuf;
+#endif
 	char numbuf[16];
 
 	/*
@@ -808,10 +810,8 @@ finish_tty()
 
 #ifndef __linux__
 	if (tty_mode != (mode_t) -1) {
-		if (fchmod(real_ttyfd, tty_mode) != 0) {
-			/* XXX if devnam is a symlink, this will change the link */
-			chmod(devnam, tty_mode);
-		}
+		if (fchmod(real_ttyfd, tty_mode) != 0)
+			error("Couldn't restore tty permissions");
 	}
 #endif /* __linux__ */