fail if /etc/ppp/options not present if -DREQ_SYSOPTIONS=1

diff --git a/pppd/main.c b/pppd/main.c
index 638e296ba3e13702d0549f366c963cc1c0a042a6..4e1e3de522e4ea4dda2dabd9a600e826b4cc4ffa 100644 (file)
--- a/pppd/main.c
+++ b/pppd/main.c
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char rcsid[] = "$Id: main.c,v 1.1 1993/11/11 03:54:25 paulus Exp $";
+static char rcsid[] = "$Id: main.c,v 1.2 1993/11/23 23:40:53 paulus Exp $";

 #endif
 
 #define SETSID
 #endif
 
 #define SETSID


@@ -31,6 +31,14 @@ static char rcsid[] = "$Id: main.c,v 1.1 1993/11/11 03:54:25 paulus Exp $";
 #include <netdb.h>
 #include <utmp.h>
 
 #include <netdb.h>
 #include <utmp.h>
 

+/*
+ * If REQ_SYSOPTIONS is defined to 1, pppd will not run unless
+ * /etc/ppp/options exists.
+ */
+#ifndef        REQ_SYSOPTIONS
+#define REQ_SYSOPTIONS 0
+#endif
+

 #ifdef STREAMS
 #undef SGTTY
 #endif
 #ifdef STREAMS
 #undef SGTTY
 #endif


@@ -225,7 +233,7 @@ main(argc, argv)
   
     progname = *argv;
 
   
     progname = *argv;
 

-    if (!options_from_file(_PATH_SYSOPTIONS) ||
+    if (!options_from_file(_PATH_SYSOPTIONS, REQ_SYSOPTIONS) ||

        !options_from_user() ||
        !parse_args(argc-1, argv+1))
        die(1);
        !options_from_user() ||
        !parse_args(argc-1, argv+1))
        die(1);