Remove the requirement that redistributions in binary form reproduce

[ppp.git] / pppd / tty.c

diff --git a/pppd/tty.c b/pppd/tty.c
index d6026981613a67e736062e4f30a7cd50ed52e822..5d65cd2765a485f43a07a3d99dcef81b47ddc851 100644 (file)
--- a/pppd/tty.c
+++ b/pppd/tty.c
@@ -1,7 +1,7 @@
 /*
  * tty.c - code for handling serial ports in pppd.
  *
- * Copyright (C) 2000-2002 Paul Mackerras. All rights reserved.
+ * Copyright (C) 2000-2004 Paul Mackerras. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,16 +10,11 @@
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The name(s) of the authors of this software must not be used to
+ * 2. The name(s) of the authors of this software must not be used to
  *    endorse or promote products derived from this software without
  *    prior written permission.
  *
- * 4. Redistributions of any form whatsoever must retain the following
+ * 3. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by Paul Mackerras
  *     <paulus@samba.org>".
@@ -73,7 +68,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.18 2004/11/04 10:02:26 paulus Exp $"
 
 #include <stdio.h>
 #include <ctype.h>
@@ -300,7 +295,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;
@@ -459,7 +454,7 @@ tty_check_options()
        if (using_pty) {
                if (!default_device) {
                        option_error("%s option precludes specifying device name",
-                                    notty? "notty": "pty");
+                                    pty_socket? "socket": notty? "notty": "pty");
                        exit(EXIT_OPTION_ERROR);
                }
                if (ptycommand != NULL && notty) {
@@ -512,7 +507,9 @@ int connect_tty()
 {
        char *connector;
        int fdflags;
+#ifndef __linux__
        struct stat statbuf;
+#endif
        char numbuf[16];
 
        /*
@@ -654,6 +651,9 @@ int connect_tty()
                        return -1;
        }
 
+       if (using_pty || record_file != NULL)
+               ttyfd = pty_slave;
+
        /* run connection script */
        if ((connector && connector[0]) || initializer) {
                if (real_ttyfd != -1) {
@@ -808,10 +808,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__ */
 
@@ -916,7 +914,6 @@ start_charshunt(ifd, ofd)
     add_notifier(&sigreceived, stop_charshunt, 0);
     close(pty_master);
     pty_master = -1;
-    ttyfd = pty_slave;
     record_child(cpid, "pppd (charshunt)", charshunt_done, NULL);
     return 1;
 }