Minor fix to #if around alloca.h

[ppp.git] / pppd / main.c

diff --git a/pppd/main.c b/pppd/main.c
index 69cc5c4ee6a3fdf052ce793b3d3851f847515c57..6ec72b44a7a550dc6994fb8edeae60c5d655c26d 100644 (file)
--- a/pppd/main.c
+++ b/pppd/main.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: main.c,v 1.21 1995/04/24 05:56:13 paulus Exp $";
+static char rcsid[] = "$Id: main.c,v 1.24 1995/06/12 11:22:49 paulus Exp $";
 #endif
 
 #include <stdio.h>
@@ -65,8 +65,8 @@ int ifunit;                   /* Interface unit number */
 
 char *progname;                        /* Name of this program */
 char hostname[MAXNAMELEN];     /* Our hostname */
-static char pidfilename[MAXPATHLEN];
-
+static char pidfilename[MAXPATHLEN];   /* name of pid file */
+static char default_devnam[MAXPATHLEN];        /* name of default device */
 static pid_t   pid;            /* Our pid */
 static pid_t   pgrpid;         /* Process Group ID */
 static uid_t uid;              /* Our real user-id */
@@ -160,6 +160,7 @@ main(argc, argv)
     p = ttyname(0);
     if (p)
        strcpy(devnam, p);
+    strcpy(default_devnam, devnam);
 
     if (gethostname(hostname, MAXNAMELEN) < 0 ) {
        perror("couldn't get hostname");
@@ -192,6 +193,13 @@ main(argc, argv)
     check_auth_options();
     setipdefault();
 
+    /*
+     * If the user has specified the default device name explicitly,
+     * pretend they hadn't.
+     */
+    if (!default_device && strcmp(devnam, default_devnam) == 0)
+       default_device = 1;
+
     /*
      * Initialize system-dependent stuff and magic number package.
      */
@@ -298,10 +306,10 @@ main(argc, argv)
                die(1);
            }
 
-           syslog(LOG_INFO, "Connected...");
+           syslog(LOG_INFO, "Serial connection established.");
            sleep(1);           /* give it time to set up its terminal */
        }
-  
+
        /* set line speed, flow control, etc.; clear CLOCAL if modem option */
        set_up_tty(fd, 0);
 
@@ -357,6 +365,7 @@ main(argc, argv)
        /*
         * Run disconnector script, if requested.
         * First we need to reset non-blocking mode.
+        * XXX we may not be able to do this if the line has hung up!
         */
        if (initfdflags != -1 && fcntl(fd, F_SETFL, initfdflags) >= 0)
            initfdflags = -1;
@@ -365,10 +374,9 @@ main(argc, argv)
            set_up_tty(fd, 1);
            if (device_script(disconnector, fd, fd) < 0) {
                syslog(LOG_WARNING, "disconnect script failed");
-               die(1);
+           } else {
+               syslog(LOG_INFO, "Serial link disconnected.");
            }
-
-           syslog(LOG_INFO, "Disconnected...");
        }
 
        close_fd();
@@ -378,10 +386,7 @@ main(argc, argv)
 
     } while (persist);
 
-    if (lockflag && !default_device)
-       unlock();
-
-    exit(0);
+    die(0);
 }
 
 
@@ -402,7 +407,7 @@ get_input()
        return;
 
     if (len == 0) {
-       MAINDEBUG((LOG_DEBUG, "End of file on fd!"));
+       syslog(LOG_NOTICE, "Modem hangup");
        hungup = 1;
        lcp_lowerdown(0);       /* serial link is no longer available */
        phase = PHASE_DEAD;
@@ -433,21 +438,21 @@ get_input()
     /*
      * Upcall the proper protocol input routine.
      */
-    for (i = 0; i < sizeof (prottbl) / sizeof (struct protent); i++)
+    for (i = 0; i < sizeof (prottbl) / sizeof (struct protent); i++) {
        if (prottbl[i].protocol == protocol) {
            (*prottbl[i].input)(0, p, len);
-           break;
-       } else if (protocol == (prottbl[i].protocol & ~0x8000)
-                  && prottbl[i].datainput != NULL) {
+           return;
+       }
+        if (protocol == (prottbl[i].protocol & ~0x8000)
+           && prottbl[i].datainput != NULL) {
            (*prottbl[i].datainput)(0, p, len);
-           break;
+           return;
        }
-
-    if (i == sizeof (prottbl) / sizeof (struct protent)) {
-       if (debug)
-           syslog(LOG_WARNING, "Unknown protocol (0x%x) received", protocol);
-       lcp_sprotrej(0, p - PPP_HDRLEN, len + PPP_HDRLEN);
     }
+
+    if (debug)
+       syslog(LOG_WARNING, "Unknown protocol (0x%x) received", protocol);
+    lcp_sprotrej(0, p - PPP_HDRLEN, len + PPP_HDRLEN);
 }
 
 
@@ -523,6 +528,8 @@ cleanup(status, arg)
 void
 close_fd()
 {
+    disestablish_ppp();
+
     /* drop dtr to hang up */
     if (modem)
        setdtr(fd, FALSE);
@@ -531,8 +538,6 @@ close_fd()
        syslog(LOG_WARNING, "Couldn't restore device fd flags: %m");
     initfdflags = -1;
 
-    disestablish_ppp();
-
     restore_tty();
 
     close(fd);
@@ -755,6 +760,7 @@ device_script(program, in, out)
 {
     int pid;
     int status;
+    int errfd;
 
     pid = fork();
 
@@ -764,10 +770,13 @@ device_script(program, in, out)
     }
 
     if (pid == 0) {
-       setuid(getuid());
-       setgid(getgid());
        dup2(in, 0);
        dup2(out, 1);
+       errfd = open(_PATH_CONNERRS, O_WRONLY | O_APPEND | O_CREAT, 0644);
+       if (errfd >= 0)
+           dup2(errfd, 2);
+       setuid(getuid());
+       setgid(getgid());
        execl("/bin/sh", "sh", "-c", program, (char *)0);
        syslog(LOG_ERR, "could not exec /bin/sh: %m");
        _exit(99);