added papcrypt option

[ppp.git] / pppd / options.c

diff --git a/pppd/options.c b/pppd/options.c
index b7e517a1272a93829d55bd115acf277f43e489c8..5c207d7bb2adf205b93da1bb764ac91dc69caa3a 100644 (file)
--- a/pppd/options.c
+++ b/pppd/options.c
@@ -18,21 +18,23 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char rcsid[] = "$Id: options.c,v 1.6 1994/05/01 11:45:53 paulus Exp $";
+static char rcsid[] = "$Id: options.c,v 1.18 1995/04/26 06:46:09 paulus Exp $";

 #endif
 
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
 #endif
 
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>

+#include <limits.h>

 #include <stdlib.h>
 #include <termios.h>
 #include <syslog.h>
 #include <string.h>
 #include <netdb.h>
 #include <stdlib.h>
 #include <termios.h>
 #include <syslog.h>
 #include <string.h>
 #include <netdb.h>

+#include <pwd.h>

 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/stat.h>

+#include <netinet/in.h>

 
 

-#include "ppp.h"

 #include "pppd.h"
 #include "pathnames.h"
 #include "patchlevel.h"
 #include "pppd.h"
 #include "pathnames.h"
 #include "patchlevel.h"


@@ -41,105 +43,132 @@ static char rcsid[] = "$Id: options.c,v 1.6 1994/05/01 11:45:53 paulus Exp $";
 #include "ipcp.h"
 #include "upap.h"
 #include "chap.h"
 #include "ipcp.h"
 #include "upap.h"
 #include "chap.h"

+#include "ccp.h"
+
+#include <net/ppp-comp.h>

 
 #define FALSE  0
 #define TRUE   1
 
 
 #define FALSE  0
 #define TRUE   1
 

-#ifdef ultrix
-char *strdup __ARGS((char *));
+#if defined(ultrix) || defined(NeXT)
+char *strdup __P((char *));
+#endif
+
+#ifndef GIDSET_TYPE
+#define GIDSET_TYPE    gid_t

 #endif
 
 /*
 #endif
 
 /*

- * Prototypes
+ * Option variables and default values.

  */
  */

-static int setdebug __ARGS((void));
-static int setkdebug __ARGS((char **));
-static int setpassive __ARGS((void));
-static int setsilent __ARGS((void));
-static int noopt __ARGS((void));
-static int setnovj __ARGS((void));
-static int reqpap __ARGS((void));
-static int nopap __ARGS((void));
-static int setupapfile __ARGS((char **));
-static int nochap __ARGS((void));
-static int reqchap __ARGS((void));
-static int setspeed __ARGS((char *));
-static int noaccomp __ARGS((void));
-static int noasyncmap __ARGS((void));
-static int noipaddr __ARGS((void));
-static int nomagicnumber __ARGS((void));
-static int setasyncmap __ARGS((char **));
-static int setescape __ARGS((char **));
-static int setmru __ARGS((char **));
-static int setmtu __ARGS((char **));
-static int nomru __ARGS((void));
-static int nopcomp __ARGS((void));
-static int setconnector __ARGS((char **));
-static int setdisconnector __ARGS((char **));
-static int setdomain __ARGS((char **));
-static int setnetmask __ARGS((char **));
-static int setcrtscts __ARGS((void));
-static int setnodetach __ARGS((void));
-static int setmodem __ARGS((void));
-static int setlocal __ARGS((void));
-static int setlock __ARGS((void));
-static int setname __ARGS((char **));
-static int setuser __ARGS((char **));
-static int setremote __ARGS((char **));
-static int setauth __ARGS((void));
-static int readfile __ARGS((char **));
-static int setdefaultroute __ARGS((void));
-static int setproxyarp __ARGS((void));
-static int setpersist __ARGS((void));
-static int setdologin __ARGS((void));
-static int setusehostname __ARGS((void));
-static int setnoipdflt __ARGS((void));
-static int setlcptimeout __ARGS((char **));
-static int setlcpterm __ARGS((char **));
-static int setlcpconf __ARGS((char **));
-static int setlcpfails __ARGS((char **));
-static int setipcptimeout __ARGS((char **));
-static int setipcpterm __ARGS((char **));
-static int setipcpconf __ARGS((char **));
-static int setipcpfails __ARGS((char **));
-static int setpaptimeout __ARGS((char **));
-static int setpapreqs __ARGS((char **));
-static int setchaptimeout __ARGS((char **));
-static int setchapchal __ARGS((char **));
-static int setchapintv __ARGS((char **));
-static int setipcpaccl __ARGS((void));
-static int setipcpaccr __ARGS((void));
-
-static int number_option __ARGS((char *, long *, int));
-
+int    debug = 0;              /* Debug flag */
+int    kdebugflag = 0;         /* Tell kernel to print debug messages */
+int    default_device = 1;     /* Using /dev/tty or equivalent */
+char   devnam[MAXPATHLEN] = "/dev/tty";        /* Device name */
+int    crtscts = 0;            /* Use hardware flow control */
+int    modem = 1;              /* Use modem control lines */
+int    inspeed = 0;            /* Input/Output speed requested */
+u_int32_t netmask = 0;         /* IP netmask to set on interface */
+int    lockflag = 0;           /* Create lock file to lock the serial dev */
+int    nodetach = 0;           /* Don't detach from controlling tty */
+char   *connector = NULL;      /* Script to establish physical link */
+char   *disconnector = NULL;   /* Script to disestablish physical link */
+char   user[MAXNAMELEN];       /* Username for PAP */
+char   passwd[MAXSECRETLEN];   /* Password for PAP */
+int    auth_required = 0;      /* Peer is required to authenticate */
+int    defaultroute = 0;       /* assign default route through interface */
+int    proxyarp = 0;           /* Set up proxy ARP entry for peer */
+int    persist = 0;            /* Reopen link after it goes down */
+int    uselogin = 0;           /* Use /etc/passwd for checking PAP */
+int    lcp_echo_interval = 0;  /* Interval between LCP echo-requests */
+int    lcp_echo_fails = 0;     /* Tolerance to unanswered echo-requests */
+char   our_name[MAXNAMELEN];   /* Our name for authentication purposes */
+char   remote_name[MAXNAMELEN]; /* Peer's name for authentication */
+int    usehostname = 0;        /* Use hostname for our_name */
+int    disable_defaultip = 0;  /* Don't use hostname for default IP adrs */
+char   *ipparam = NULL;        /* Extra parameter for ip up/down scripts */
+int    cryptpap;               /* Passwords in pap-secrets are encrypted */
+
+#ifdef _linux_
+int idle_time_limit = 0;
+static int setidle __P((char **));
+#endif

 
 /*
 
 /*

- * Option variables
+ * Prototypes

  */
  */

-extern char *progname;
-extern int debug;
-extern int kdebugflag;
-extern int modem;
-extern int lockflag;
-extern int crtscts;
-extern int nodetach;
-extern char *connector;
-extern char *disconnector;
-extern int inspeed;
-extern char devname[];
-extern int default_device;
-extern u_long netmask;
-extern int detach;
-extern char user[];
-extern char passwd[];
-extern int auth_required;
-extern int proxyarp;
-extern int persist;
-extern int uselogin;
-extern char our_name[];
-extern char remote_name[];
-int usehostname;
-int disable_defaultip;
+static int setdebug __P((void));
+static int setkdebug __P((char **));
+static int setpassive __P((void));
+static int setsilent __P((void));
+static int noopt __P((void));
+static int setnovj __P((void));
+static int setnovjccomp __P((void));
+static int setvjslots __P((char **));
+static int reqpap __P((void));
+static int nopap __P((void));
+static int setupapfile __P((char **));
+static int nochap __P((void));
+static int reqchap __P((void));
+static int setspeed __P((char *));
+static int noaccomp __P((void));
+static int noasyncmap __P((void));
+static int noipaddr __P((void));
+static int nomagicnumber __P((void));
+static int setasyncmap __P((char **));
+static int setescape __P((char **));
+static int setmru __P((char **));
+static int setmtu __P((char **));
+static int nomru __P((void));
+static int nopcomp __P((void));
+static int setconnector __P((char **));
+static int setdisconnector __P((char **));
+static int setdomain __P((char **));
+static int setnetmask __P((char **));
+static int setcrtscts __P((void));
+static int setnocrtscts __P((void));
+static int setxonxoff __P((void));
+static int setnodetach __P((void));
+static int setmodem __P((void));
+static int setlocal __P((void));
+static int setlock __P((void));
+static int setname __P((char **));
+static int setuser __P((char **));
+static int setremote __P((char **));
+static int setauth __P((void));
+static int readfile __P((char **));
+static int setdefaultroute __P((void));
+static int setproxyarp __P((void));
+static int setpersist __P((void));
+static int setdologin __P((void));
+static int setusehostname __P((void));
+static int setnoipdflt __P((void));
+static int setlcptimeout __P((char **));
+static int setlcpterm __P((char **));
+static int setlcpconf __P((char **));
+static int setlcpfails __P((char **));
+static int setipcptimeout __P((char **));
+static int setipcpterm __P((char **));
+static int setipcpconf __P((char **));
+static int setipcpfails __P((char **));
+static int setpaptimeout __P((char **));
+static int setpapreqs __P((char **));
+static int setchaptimeout __P((char **));
+static int setchapchal __P((char **));
+static int setchapintv __P((char **));
+static int setipcpaccl __P((void));
+static int setipcpaccr __P((void));
+static int setlcpechointv __P((char **));
+static int setlcpechofails __P((char **));
+static int setbsdcomp __P((char **));
+static int setnobsdcomp __P((void));
+static int setipparam __P((char **));
+static int setpapcrypt __P((void));
+
+static int number_option __P((char *, long *, int));
+static int readable __P((int fd));
+
+void usage();

 
 /*
  * Valid arguments.
 
 /*
  * Valid arguments.


@@ -149,71 +178,88 @@ static struct cmd {
     int num_args;
     int (*cmd_func)();
 } cmds[] = {
     int num_args;
     int (*cmd_func)();
 } cmds[] = {

-    "-all", 0, noopt,          /* Don't request/allow any options */
-    "-ac", 0, noaccomp,                /* Disable Address/Control compress */
-    "-am", 0, noasyncmap,      /* Disable asyncmap negotiation */
-    "-as", 1, setasyncmap,     /* set the desired async map */
-    "-d", 0, setdebug,         /* Increase debugging level */
-    "-detach", 0, setnodetach, /* don't fork */
-    "-ip", 0, noipaddr,                /* Disable IP address negotiation */
-    "-mn", 0, nomagicnumber,   /* Disable magic number negotiation */
-    "-mru", 0, nomru,          /* Disable mru negotiation */
-    "-p", 0, setpassive,       /* Set passive mode */
-    "-pc", 0, nopcomp,         /* Disable protocol field compress */
-    "+ua", 1, setupapfile,     /* Get PAP user and password from file */
-    "+pap", 0, reqpap,         /* Require PAP auth from peer */
-    "-pap", 0, nopap,          /* Don't allow UPAP authentication with peer */
-    "+chap", 0, reqchap,       /* Require CHAP authentication from peer */
-    "-chap", 0, nochap,                /* Don't allow CHAP authentication with peer */
-    "-vj", 0, setnovj,         /* disable VJ compression */
-    "asyncmap", 1, setasyncmap,        /* set the desired async map */
-    "escape", 1, setescape,    /* set chars to escape on transmission */
-    "connect", 1, setconnector,        /* A program to set up a connection */
-    "disconnect", 1, setdisconnector,  /* program to disconnect serial dev. */
-    "crtscts", 0, setcrtscts,  /* set h/w flow control */
-    "debug", 0, setdebug,      /* Increase debugging level */
-    "kdebug", 1, setkdebug,    /* Enable kernel-level debugging */
-    "domain", 1, setdomain,    /* Add given domain name to hostname*/
-    "mru", 1, setmru,          /* Set MRU value for negotiation */
-    "mtu", 1, setmtu,          /* Set our MTU */
-    "netmask", 1, setnetmask,  /* set netmask */
-    "passive", 0, setpassive,  /* Set passive mode */
-    "silent", 0, setsilent,    /* Set silent mode */
-    "modem", 0, setmodem,      /* Use modem control lines */
-    "local", 0, setlocal,      /* Don't use modem control lines */
-    "lock", 0, setlock,                /* Lock serial device (with lock file) */
-    "name", 1, setname,                /* Set local name for authentication */
-    "user", 1, setuser,                /* Set username for PAP auth with peer */
-    "usehostname", 0, setusehostname,  /* Must use hostname for auth. */
-    "remotename", 1, setremote,        /* Set remote name for authentication */
-    "auth", 0, setauth,                /* Require authentication from peer */
-    "file", 1, readfile,       /* Take options from a file */
-    "defaultroute", 0, setdefaultroute,        /* Add default route */
-    "proxyarp", 0, setproxyarp,        /* Add proxy ARP entry */
-    "persist", 0, setpersist,  /* Keep on reopening connection after close */
-    "login", 0, setdologin,    /* Use system password database for UPAP */
-    "noipdefault", 0, setnoipdflt, /* Don't use name for default IP adrs */
-    "lcp-restart", 1, setlcptimeout,   /* Set timeout for LCP */
-    "lcp-max-terminate", 1, setlcpterm,        /* Set max #xmits for term-reqs */
-    "lcp-max-configure", 1, setlcpconf,        /* Set max #xmits for conf-reqs */
-    "lcp-max-failure", 1, setlcpfails, /* Set max #conf-naks for LCP */
-    "ipcp-restart", 1, setipcptimeout, /* Set timeout for IPCP */
-    "ipcp-max-terminate", 1, setipcpterm, /* Set max #xmits for term-reqs */
-    "ipcp-max-configure", 1, setipcpconf, /* Set max #xmits for conf-reqs */
-    "ipcp-max-failure", 1, setipcpfails,  /* Set max #conf-naks for IPCP */
-    "pap-restart", 1, setpaptimeout,   /* Set timeout for UPAP */
-    "pap-max-authreq", 1, setpapreqs,  /* Set max #xmits for auth-reqs */
-    "chap-restart", 1, setchaptimeout, /* Set timeout for CHAP */
-    "chap-max-challenge", 1, setchapchal, /* Set max #xmits for challenge */
-    "chap-interval", 1, setchapintv,   /* Set interval for rechallenge */
-    "ipcp-accept-local", 0, setipcpaccl, /* Accept peer's address for us */
-    "ipcp-accept-remote", 0, setipcpaccr, /* Accept peer's address for it */
-    NULL
+    {"-all", 0, noopt},                /* Don't request/allow any options */
+    {"-ac", 0, noaccomp},      /* Disable Address/Control compress */
+    {"-am", 0, noasyncmap},    /* Disable asyncmap negotiation */
+    {"-as", 1, setasyncmap},   /* set the desired async map */
+    {"-d", 0, setdebug},       /* Increase debugging level */
+    {"-detach", 0, setnodetach}, /* don't fork */
+    {"-ip", 0, noipaddr},      /* Disable IP address negotiation */
+    {"-mn", 0, nomagicnumber}, /* Disable magic number negotiation */
+    {"-mru", 0, nomru},                /* Disable mru negotiation */
+    {"-p", 0, setpassive},     /* Set passive mode */
+    {"-pc", 0, nopcomp},       /* Disable protocol field compress */
+    {"+ua", 1, setupapfile},   /* Get PAP user and password from file */
+    {"+pap", 0, reqpap},       /* Require PAP auth from peer */
+    {"-pap", 0, nopap},                /* Don't allow UPAP authentication with peer */
+    {"+chap", 0, reqchap},     /* Require CHAP authentication from peer */
+    {"-chap", 0, nochap},      /* Don't allow CHAP authentication with peer */
+    {"-vj", 0, setnovj},       /* disable VJ compression */
+    {"-vjccomp", 0, setnovjccomp}, /* disable VJ connection-ID compression */
+    {"vj-max-slots", 1, setvjslots}, /* Set maximum VJ header slots */
+    {"asyncmap", 1, setasyncmap}, /* set the desired async map */
+    {"escape", 1, setescape},  /* set chars to escape on transmission */
+    {"connect", 1, setconnector}, /* A program to set up a connection */
+    {"disconnect", 1, setdisconnector},        /* program to disconnect serial dev. */
+    {"crtscts", 0, setcrtscts},        /* set h/w flow control */
+    {"-crtscts", 0, setnocrtscts}, /* clear h/w flow control */
+    {"xonxoff", 0, setxonxoff},        /* set s/w flow control */
+    {"debug", 0, setdebug},    /* Increase debugging level */
+    {"kdebug", 1, setkdebug},  /* Enable kernel-level debugging */
+    {"domain", 1, setdomain},  /* Add given domain name to hostname*/
+    {"mru", 1, setmru},                /* Set MRU value for negotiation */
+    {"mtu", 1, setmtu},                /* Set our MTU */
+    {"netmask", 1, setnetmask},        /* set netmask */
+    {"passive", 0, setpassive},        /* Set passive mode */
+    {"silent", 0, setsilent},  /* Set silent mode */
+    {"modem", 0, setmodem},    /* Use modem control lines */
+    {"local", 0, setlocal},    /* Don't use modem control lines */
+    {"lock", 0, setlock},      /* Lock serial device (with lock file) */
+    {"name", 1, setname},      /* Set local name for authentication */
+    {"user", 1, setuser},      /* Set username for PAP auth with peer */
+    {"usehostname", 0, setusehostname},        /* Must use hostname for auth. */
+    {"remotename", 1, setremote}, /* Set remote name for authentication */
+    {"auth", 0, setauth},      /* Require authentication from peer */
+    {"file", 1, readfile},     /* Take options from a file */
+    {"defaultroute", 0, setdefaultroute}, /* Add default route */
+    {"proxyarp", 0, setproxyarp}, /* Add proxy ARP entry */
+    {"persist", 0, setpersist},        /* Keep on reopening connection after close */
+    {"login", 0, setdologin},  /* Use system password database for UPAP */
+    {"noipdefault", 0, setnoipdflt}, /* Don't use name for default IP adrs */
+    {"lcp-echo-failure", 1, setlcpechofails}, /* consecutive echo failures */
+    {"lcp-echo-interval", 1, setlcpechointv}, /* time for lcp echo events */
+    {"lcp-restart", 1, setlcptimeout}, /* Set timeout for LCP */
+    {"lcp-max-terminate", 1, setlcpterm}, /* Set max #xmits for term-reqs */
+    {"lcp-max-configure", 1, setlcpconf}, /* Set max #xmits for conf-reqs */
+    {"lcp-max-failure", 1, setlcpfails}, /* Set max #conf-naks for LCP */
+    {"ipcp-restart", 1, setipcptimeout}, /* Set timeout for IPCP */
+    {"ipcp-max-terminate", 1, setipcpterm}, /* Set max #xmits for term-reqs */
+    {"ipcp-max-configure", 1, setipcpconf}, /* Set max #xmits for conf-reqs */
+    {"ipcp-max-failure", 1, setipcpfails}, /* Set max #conf-naks for IPCP */
+    {"pap-restart", 1, setpaptimeout}, /* Set timeout for UPAP */
+    {"pap-max-authreq", 1, setpapreqs}, /* Set max #xmits for auth-reqs */
+    {"chap-restart", 1, setchaptimeout}, /* Set timeout for CHAP */
+    {"chap-max-challenge", 1, setchapchal}, /* Set max #xmits for challenge */
+    {"chap-interval", 1, setchapintv}, /* Set interval for rechallenge */
+    {"ipcp-accept-local", 0, setipcpaccl}, /* Accept peer's address for us */
+    {"ipcp-accept-remote", 0, setipcpaccr}, /* Accept peer's address for it */
+    {"bsdcomp", 1, setbsdcomp},                /* request BSD-Compress */
+    {"-bsdcomp", 0, setnobsdcomp},     /* don't allow BSD-Compress */
+    {"ipparam", 1, setipparam},                /* set ip script parameter */
+    {"papcrypt", 0, setpapcrypt},      /* PAP passwords encrypted */
+#ifdef _linux_
+    {"idle-disconnect", 1, setidle}, /* seconds for disconnect of idle IP */
+#endif
+    {NULL, 0, NULL}

 };
 
 
 };
 
 

+#ifndef IMPLEMENTATION
+#define IMPLEMENTATION ""
+#endif
+

 static char *usage_string = "\
 static char *usage_string = "\

-pppd version %s patch level %d\n\
+pppd version %s patch level %d%s\n\

 Usage: %s [ arguments ], where arguments are:\n\
        <device>        Communicate over the named device\n\
        <speed>         Set the baud rate to <speed>\n\
 Usage: %s [ arguments ], where arguments are:\n\
        <device>        Communicate over the named device\n\
        <speed>         Set the baud rate to <speed>\n\


@@ -243,6 +289,7 @@ parse_args(argc, argv)
 {
     char *arg, *val;
     struct cmd *cmdp;
 {
     char *arg, *val;
     struct cmd *cmdp;

+    int ret;

 
     while (argc > 0) {
        arg = *argv++;
 
     while (argc > 0) {
        arg = *argv++;


@@ -269,11 +316,15 @@ parse_args(argc, argv)
            /*
             * Maybe a tty name, speed or IP address?
             */
            /*
             * Maybe a tty name, speed or IP address?
             */

-           if (!setdevname(arg) && !setspeed(arg) && !setipaddr(arg)) {
+           if ((ret = setdevname(arg)) == 0
+               && (ret = setspeed(arg)) == 0
+               && (ret = setipaddr(arg)) == 0) {

                fprintf(stderr, "%s: unrecognized command\n", arg);
                usage();
                return 0;
            }
                fprintf(stderr, "%s: unrecognized command\n", arg);
                usage();
                return 0;
            }

+           if (ret < 0)        /* error */
+               return 0;

        }
     }
     return 1;
        }
     }
     return 1;


@@ -282,9 +333,11 @@ parse_args(argc, argv)
 /*
  * usage - print out a message telling how to use the program.
  */
 /*
  * usage - print out a message telling how to use the program.
  */

+void

 usage()
 {
 usage()
 {

-    fprintf(stderr, usage_string, VERSION, PATCHLEVEL, progname);
+    fprintf(stderr, usage_string, VERSION, PATCHLEVEL, IMPLEMENTATION,
+           progname);

 }
 
 /*
 }
 
 /*


@@ -292,12 +345,13 @@ usage()
  * and interpret them.
  */
 int
  * and interpret them.
  */
 int

-options_from_file(filename, must_exist)
+options_from_file(filename, must_exist, check_prot)

     char *filename;
     int must_exist;
     char *filename;
     int must_exist;

+    int check_prot;

 {
     FILE *f;
 {
     FILE *f;

-    int i, newline;
+    int i, newline, ret;

     struct cmd *cmdp;
     char *argv[MAXARGS];
     char args[MAXARGS][MAXWORDLEN];
     struct cmd *cmdp;
     char *argv[MAXARGS];
     char args[MAXARGS][MAXWORDLEN];


@@ -309,6 +363,12 @@ options_from_file(filename, must_exist)
        perror(filename);
        return 0;
     }
        perror(filename);
        return 0;
     }

+    if (check_prot && !readable(fileno(f))) {
+       fprintf(stderr, "%s: access denied\n", filename);
+       fclose(f);
+       return 0;
+    }
+

     while (getword(f, cmd, &newline, filename)) {
        /*
         * First see if it's a command.
     while (getword(f, cmd, &newline, filename)) {
        /*
         * First see if it's a command.


@@ -337,12 +397,16 @@ options_from_file(filename, must_exist)
            /*
             * Maybe a tty name, speed or IP address?
             */
            /*
             * Maybe a tty name, speed or IP address?
             */

-           if (!setdevname(cmd) && !setspeed(cmd) && !setipaddr(cmd)) {
+           if ((ret = setdevname(cmd)) == 0
+               && (ret = setspeed(cmd)) == 0
+               && (ret = setipaddr(cmd)) == 0) {

                fprintf(stderr, "In file %s: unrecognized command %s\n",
                        filename, cmd);
                fclose(f);
                return 0;
            }
                fprintf(stderr, "In file %s: unrecognized command %s\n",
                        filename, cmd);
                fclose(f);
                return 0;
            }

+           if (ret < 0)        /* error */
+               return 0;

        }
     }
     return 1;
        }
     }
     return 1;


@@ -357,20 +421,78 @@ options_from_user()
 {
     char *user, *path, *file;
     int ret;
 {
     char *user, *path, *file;
     int ret;

+    struct passwd *pw;

 
 

-    if ((user = getenv("HOME")) == NULL)
-       return;
-    file = "/.ppprc";
-    path = malloc(strlen(user) + strlen(file) + 1);
+    pw = getpwuid(getuid());
+    if (pw == NULL || (user = pw->pw_dir) == NULL || user[0] == 0)
+       return 1;
+    file = _PATH_USEROPT;
+    path = malloc(strlen(user) + strlen(file) + 2);

     if (path == NULL)
        novm("init file name");
     strcpy(path, user);
     if (path == NULL)
        novm("init file name");
     strcpy(path, user);

+    strcat(path, "/");

     strcat(path, file);
     strcat(path, file);

-    ret = options_from_file(path, 0);
+    ret = options_from_file(path, 0, 1);

     free(path);
     return ret;
 }
 
     free(path);
     return ret;
 }
 

+/*
+ * options_for_tty - See if an options file exists for the serial
+ * device, and if so, interpret options from it.
+ */
+int
+options_for_tty()
+{
+    char *dev, *path;
+    int ret;
+
+    dev = strrchr(devnam, '/');
+    if (dev == NULL)
+       dev = devnam;
+    else
+       ++dev;
+    if (strcmp(dev, "tty") == 0)
+       return 1;               /* don't look for /etc/ppp/options.tty */
+    path = malloc(strlen(_PATH_TTYOPT) + strlen(dev) + 1);
+    if (path == NULL)
+       novm("tty init file name");
+    strcpy(path, _PATH_TTYOPT);
+    strcat(path, dev);
+    ret = options_from_file(path, 0, 0);
+    free(path);
+    return ret;
+}
+
+/*
+ * readable - check if a file is readable by the real user.
+ */
+static int
+readable(fd)
+    int fd;
+{
+    uid_t uid;
+    int ngroups, i;
+    struct stat sbuf;
+    GIDSET_TYPE groups[NGROUPS_MAX];
+
+    uid = getuid();
+    if (uid == 0)
+       return 1;
+    if (fstat(fd, &sbuf) != 0)
+       return 0;
+    if (sbuf.st_uid == uid)
+       return sbuf.st_mode & S_IRUSR;
+    if (sbuf.st_gid == getgid())
+       return sbuf.st_mode & S_IRGRP;
+    ngroups = getgroups(NGROUPS_MAX, groups);
+    for (i = 0; i < ngroups; ++i)
+       if (sbuf.st_gid == groups[i])
+           return sbuf.st_mode & S_IRGRP;
+    return sbuf.st_mode & S_IROTH;
+}
+

 /*
  * Read a word from a file.
  * Words are delimited by white-space or by quotes (").
 /*
  * Read a word from a file.
  * Words are delimited by white-space or by quotes (").


@@ -527,7 +649,7 @@ static int
 readfile(argv)
     char **argv;
 {
 readfile(argv)
     char **argv;
 {

-    return options_from_file(*argv, 1);
+    return options_from_file(*argv, 1, 1);

 }
 
 /*
 }
 
 /*


@@ -652,7 +774,7 @@ setmtu(argv)
     if (!number_option(*argv, &mtu, 0))
        return 0;
     if (mtu < MINMRU || mtu > MAXMRU) {
     if (!number_option(*argv, &mtu, 0))
        return 0;
     if (mtu < MINMRU || mtu > MAXMRU) {

-       fprintf(stderr, "mtu option value of %d is too %s\n", mtu,
+       fprintf(stderr, "mtu option value of %ld is too %s\n", mtu,

                (mtu < MINMRU? "small": "large"));
        return 0;
     }
                (mtu < MINMRU? "small": "large"));
        return 0;
     }


@@ -716,6 +838,7 @@ reqpap()
 {
     lcp_wantoptions[0].neg_upap = 1;
     auth_required = 1;
 {
     lcp_wantoptions[0].neg_upap = 1;
     auth_required = 1;

+    return 1;

 }
 
 
 }
 
 


@@ -736,6 +859,10 @@ setupapfile(argv)
        fprintf(stderr, "unable to open user login data file %s\n", *argv);
        return 0;
     }
        fprintf(stderr, "unable to open user login data file %s\n", *argv);
        return 0;
     }

+    if (!readable(fileno(ufile))) {
+       fprintf(stderr, "%s: access denied\n", *argv);
+       return 0;
+    }

     check_access(ufile, *argv);
 
     /* get username */
     check_access(ufile, *argv);
 
     /* get username */


@@ -782,7 +909,7 @@ reqchap()
 
 
 /*
 
 
 /*

- * setnovj - diable vj compression
+ * setnovj - disable vj compression

  */
 static int
 setnovj()
  */
 static int
 setnovj()


@@ -792,6 +919,40 @@ setnovj()
     return (1);
 }
 
     return (1);
 }
 

+
+/*
+ * setnovjccomp - disable VJ connection-ID compression
+ */
+static int
+setnovjccomp()
+{
+    ipcp_wantoptions[0].cflag = 0;
+    ipcp_allowoptions[0].cflag = 0;
+    return 1;
+}
+
+
+/*
+ * setvjslots - set maximum number of connection slots for VJ compression
+ */
+static int
+setvjslots(argv)
+    char **argv;
+{
+    int value;
+
+    if (!int_option(*argv, &value))
+       return 0;
+    if (value < 2 || value > 16) {
+       fprintf(stderr, "pppd: vj-max-slots value must be between 2 and 16\n");
+       return 0;
+    }
+    ipcp_wantoptions [0].maxslotindex =
+        ipcp_allowoptions[0].maxslotindex = value - 1;
+    return 1;
+}
+
+

 /*
  * setconnector - Set a program to connect to a serial line
  */
 /*
  * setconnector - Set a program to connect to a serial line
  */


@@ -871,7 +1032,7 @@ setescape(argv)
        }
        p = endp;
        if (n < 0 || 0x20 <= n && n <= 0x3F || n == 0x5E || n > 0xFF) {
        }
        p = endp;
        if (n < 0 || 0x20 <= n && n <= 0x3F || n == 0x5E || n > 0xFF) {

-           fprintf(stderr, "%s: can't escape character 0x%x\n", n);
+           fprintf(stderr, "%s: can't escape character 0x%x\n", progname, n);

            ret = 0;
        } else
            xmit_accm[0][n >> 5] |= 1 << (n & 0x1F);
            ret = 0;
        } else
            xmit_accm[0][n >> 5] |= 1 << (n & 0x1F);


@@ -923,16 +1084,16 @@ setdevname(cp)
      */
     if (stat(cp, &statbuf) < 0) {
        if (errno == ENOENT)
      */
     if (stat(cp, &statbuf) < 0) {
        if (errno == ENOENT)

-           return (0);
+           return 0;

        syslog(LOG_ERR, cp);
        syslog(LOG_ERR, cp);

-       return 0;
+       return -1;

     }
   
     }
   

-    (void) strncpy(devname, cp, MAXPATHLEN);
-    devname[MAXPATHLEN-1] = 0;
+    (void) strncpy(devnam, cp, MAXPATHLEN);
+    devnam[MAXPATHLEN-1] = 0;

     default_device = FALSE;
   
     default_device = FALSE;
   

-    return (1);
+    return 1;

 }
 
 
 }
 
 


@@ -944,15 +1105,15 @@ setipaddr(arg)
     char *arg;
 {
     struct hostent *hp;
     char *arg;
 {
     struct hostent *hp;

-    char *colon, *index();
-    u_long local, remote;
+    char *colon;
+    u_int32_t local, remote;

     ipcp_options *wo = &ipcp_wantoptions[0];
   
     /*
      * IP address pair separated by ":".
      */
     ipcp_options *wo = &ipcp_wantoptions[0];
   
     /*
      * IP address pair separated by ":".
      */

-    if ((colon = index(arg, ':')) == NULL)
-       return (0);
+    if ((colon = strchr(arg, ':')) == NULL)
+       return 0;

   
     /*
      * If colon first character, then no local addr.
   
     /*
      * If colon first character, then no local addr.


@@ -961,16 +1122,20 @@ setipaddr(arg)
        *colon = '\0';
        if ((local = inet_addr(arg)) == -1) {
            if ((hp = gethostbyname(arg)) == NULL) {
        *colon = '\0';
        if ((local = inet_addr(arg)) == -1) {
            if ((hp = gethostbyname(arg)) == NULL) {

-               fprintf(stderr, "unknown host: %s", arg);
-               local = 0;
+               fprintf(stderr, "unknown host: %s\n", arg);
+               return -1;

            } else {
            } else {

-               local = *(long *)hp->h_addr;
+               local = *(u_int32_t *)hp->h_addr;

                if (our_name[0] == 0) {
                    strncpy(our_name, arg, MAXNAMELEN);
                    our_name[MAXNAMELEN-1] = 0;
                }
            }
        }
                if (our_name[0] == 0) {
                    strncpy(our_name, arg, MAXNAMELEN);
                    our_name[MAXNAMELEN-1] = 0;
                }
            }
        }

+       if (bad_ip_adrs(local)) {
+           fprintf(stderr, "bad local IP address %s\n", ip_ntoa(local));
+           return -1;
+       }

        if (local != 0)
            wo->ouraddr = local;
        *colon = ':';
        if (local != 0)
            wo->ouraddr = local;
        *colon = ':';


@@ -982,21 +1147,25 @@ setipaddr(arg)
     if (*++colon != '\0') {
        if ((remote = inet_addr(colon)) == -1) {
            if ((hp = gethostbyname(colon)) == NULL) {
     if (*++colon != '\0') {
        if ((remote = inet_addr(colon)) == -1) {
            if ((hp = gethostbyname(colon)) == NULL) {

-               fprintf(stderr, "unknown host: %s", colon);
-               remote = 0;
+               fprintf(stderr, "unknown host: %s\n", colon);
+               return -1;

            } else {
            } else {

-               remote = *(long *)hp->h_addr;
+               remote = *(u_int32_t *)hp->h_addr;

                if (remote_name[0] == 0) {
                    strncpy(remote_name, colon, MAXNAMELEN);
                    remote_name[MAXNAMELEN-1] = 0;
                }
            }
        }
                if (remote_name[0] == 0) {
                    strncpy(remote_name, colon, MAXNAMELEN);
                    remote_name[MAXNAMELEN-1] = 0;
                }
            }
        }

+       if (bad_ip_adrs(remote)) {
+           fprintf(stderr, "bad remote IP address %s\n", ip_ntoa(remote));
+           return -1;
+       }

        if (remote != 0)
            wo->hisaddr = remote;
     }
 
        if (remote != 0)
            wo->hisaddr = remote;
     }
 

-    return (1);
+    return 1;

 }
 
 
 }
 
 


@@ -1040,7 +1209,7 @@ void
 setipdefault()
 {
     struct hostent *hp;
 setipdefault()
 {
     struct hostent *hp;

-    u_long local;
+    u_int32_t local;

     ipcp_options *wo = &ipcp_wantoptions[0];
 
     /*
     ipcp_options *wo = &ipcp_wantoptions[0];
 
     /*


@@ -1057,8 +1226,8 @@ setipdefault()
     wo->accept_local = 1;      /* don't insist on this default value */
     if ((hp = gethostbyname(hostname)) == NULL)
        return;
     wo->accept_local = 1;      /* don't insist on this default value */
     if ((hp = gethostbyname(hostname)) == NULL)
        return;

-    local = *(long *)hp->h_addr;
-    if (local != 0)
+    local = *(u_int32_t *)hp->h_addr;
+    if (local != 0 && !bad_ip_adrs(local))

        wo->ouraddr = local;
 }
 
        wo->ouraddr = local;
 }
 


@@ -1070,9 +1239,9 @@ static int
 setnetmask(argv)
     char **argv;
 {
 setnetmask(argv)
     char **argv;
 {

-    u_long mask;
-       
-    if ((mask = inet_addr(*argv)) == -1) {
+    u_int32_t mask;
+
+    if ((mask = inet_addr(*argv)) == -1 || (netmask & ~mask) != 0) {

        fprintf(stderr, "Invalid netmask %s\n", *argv);
        return 0;
     }
        fprintf(stderr, "Invalid netmask %s\n", *argv);
        return 0;
     }


@@ -1086,9 +1255,9 @@ setnetmask(argv)
  * been set. 
  */
 /* ARGSUSED */
  * been set. 
  */
 /* ARGSUSED */

-u_long
+u_int32_t

 GetMask(addr)
 GetMask(addr)

-    u_long addr;
+    u_int32_t addr;

 {
     return(netmask);
 }
 {
     return(netmask);
 }


@@ -1101,6 +1270,20 @@ setcrtscts()
     return (1);
 }
 
     return (1);
 }
 

+static int
+setnocrtscts()
+{
+    crtscts = -1;
+    return (1);
+}
+
+static int
+setxonxoff()
+{
+    crtscts = 2;
+    return (1);
+}
+

 static int
 setnodetach()
 {
 static int
 setnodetach()
 {


@@ -1200,6 +1383,24 @@ setdologin()
     return 1;
 }
 
     return 1;
 }
 

+/*
+ * Functions to set the echo interval for modem-less monitors
+ */
+
+static int
+setlcpechointv(argv)
+    char **argv;
+{
+    return int_option(*argv, &lcp_echo_interval);
+}
+
+static int
+setlcpechofails(argv)
+    char **argv;
+{
+    return int_option(*argv, &lcp_echo_fails);
+}
+

 /*
  * Functions to set timeouts, max transmits, etc.
  */
 /*
  * Functions to set timeouts, max transmits, etc.
  */


@@ -1207,77 +1408,160 @@ static int
 setlcptimeout(argv)
     char **argv;
 {
 setlcptimeout(argv)
     char **argv;
 {

-    return int_option(*argv, &lcp_fsm[0].timeouttime, 0);
+    return int_option(*argv, &lcp_fsm[0].timeouttime);
+}
+
+static int
+setlcpterm(argv)
+    char **argv;
+{
+    return int_option(*argv, &lcp_fsm[0].maxtermtransmits);
+}
+
+static int
+setlcpconf(argv)
+    char **argv;
+{
+    return int_option(*argv, &lcp_fsm[0].maxconfreqtransmits);
+}
+
+static int
+setlcpfails(argv)
+    char **argv;
+{
+    return int_option(*argv, &lcp_fsm[0].maxnakloops);

 }
 
 }
 

-static int setlcpterm(argv)
+static int
+setipcptimeout(argv)

     char **argv;
 {
     char **argv;
 {

-    return int_option(*argv, &lcp_fsm[0].maxtermtransmits, 0);
+    return int_option(*argv, &ipcp_fsm[0].timeouttime);

 }
 
 }
 

-static int setlcpconf(argv)
+static int
+setipcpterm(argv)

     char **argv;
 {
     char **argv;
 {

-    return int_option(*argv, &lcp_fsm[0].maxconfreqtransmits, 0);
+    return int_option(*argv, &ipcp_fsm[0].maxtermtransmits);

 }
 
 }
 

-static int setlcpfails(argv)
+static int
+setipcpconf(argv)

     char **argv;
 {
     char **argv;
 {

-    return int_option(*argv, &lcp_fsm[0].maxnakloops, 0);
+    return int_option(*argv, &ipcp_fsm[0].maxconfreqtransmits);

 }
 
 }
 

-static int setipcptimeout(argv)
+static int
+setipcpfails(argv)

     char **argv;
 {
     char **argv;
 {

-    return int_option(*argv, &ipcp_fsm[0].timeouttime, 0);
+    return int_option(*argv, &lcp_fsm[0].maxnakloops);

 }
 
 }
 

-static int setipcpterm(argv)
+static int
+setpaptimeout(argv)

     char **argv;
 {
     char **argv;
 {

-    return int_option(*argv, &ipcp_fsm[0].maxtermtransmits, 0);
+    return int_option(*argv, &upap[0].us_timeouttime);

 }
 
 }
 

-static int setipcpconf(argv)
+static int
+setpapreqs(argv)

     char **argv;
 {
     char **argv;
 {

-    return int_option(*argv, &ipcp_fsm[0].maxconfreqtransmits, 0);
+    return int_option(*argv, &upap[0].us_maxtransmits);

 }
 
 }
 

-static int setipcpfails(argv)
+static int
+setchaptimeout(argv)

     char **argv;
 {
     char **argv;
 {

-    return int_option(*argv, &lcp_fsm[0].maxnakloops, 0);
+    return int_option(*argv, &chap[0].timeouttime);

 }
 
 }
 

-static int setpaptimeout(argv)
+static int
+setchapchal(argv)

     char **argv;
 {
     char **argv;
 {

-    return int_option(*argv, &upap[0].us_timeouttime, 0);
+    return int_option(*argv, &chap[0].max_transmits);

 }
 
 }
 

-static int setpapreqs(argv)
+static int
+setchapintv(argv)

     char **argv;
 {
     char **argv;
 {

-    return int_option(*argv, &upap[0].us_maxtransmits, 0);
+    return int_option(*argv, &chap[0].chal_interval);

 }
 
 }
 

-static int setchaptimeout(argv)
+static int
+setbsdcomp(argv)

     char **argv;
 {
     char **argv;
 {

-    return int_option(*argv, &chap[0].timeouttime, 0);
+    int rbits, abits;
+    char *str, *endp;
+
+    str = *argv;
+    abits = rbits = strtol(str, &endp, 0);
+    if (endp != str && *endp == ',') {
+       str = endp + 1;
+       abits = strtol(str, &endp, 0);
+    }
+    if (*endp != 0 || endp == str) {
+       fprintf(stderr, "%s: invalid argument format for bsdcomp option\n",
+               progname);
+       return 0;
+    }
+    if (rbits != 0 && (rbits < BSD_MIN_BITS || rbits > BSD_MAX_BITS)
+       || abits != 0 && (abits < BSD_MIN_BITS || abits > BSD_MAX_BITS)) {
+       fprintf(stderr, "%s: bsdcomp option values must be 0 or %d .. %d\n",
+               progname, BSD_MIN_BITS, BSD_MAX_BITS);
+       return 0;
+    }
+    if (rbits > 0) {
+       ccp_wantoptions[0].bsd_compress = 1;
+       ccp_wantoptions[0].bsd_bits = rbits;
+    } else
+       ccp_wantoptions[0].bsd_compress = 0;
+    if (abits > 0) {
+       ccp_allowoptions[0].bsd_compress = 1;
+       ccp_allowoptions[0].bsd_bits = abits;
+    } else
+       ccp_allowoptions[0].bsd_compress = 0;
+    return 1;

 }
 
 }
 

-static int setchapchal(argv)
+static int
+setnobsdcomp()
+{
+    ccp_wantoptions[0].bsd_compress = 0;
+    ccp_allowoptions[0].bsd_compress = 0;
+    return 1;
+}
+
+static int
+setipparam(argv)

     char **argv;
 {
     char **argv;
 {

-    return int_option(*argv, &chap[0].max_transmits, 0);
+    ipparam = strdup(*argv);
+    if (ipparam == NULL)
+       novm("ipparam string");
+
+    return 1;
+}
+
+static int
+setpapcrypt()
+{
+    cryptpap = 1;
+    return 1;

 }
 
 }
 

-static int setchapintv(argv)
+#ifdef _linux_
+static int setidle (argv)

     char **argv;
 {
     char **argv;
 {

-    return int_option(*argv, &chap[0].chal_interval, 0);
+    return int_option(*argv, &idle_time_limit);

 }
 }

+#endif