From: Paul Mackerras <paulus@samba.org>
Date: Tue, 9 Nov 2004 22:33:35 +0000 (+0000)
Subject: Arrange for holdoff_specified to be set if the holdoff option
X-Git-Tag: ppp-2.4.7~194
X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=298bda129d41179121373122bce6c44c8f09e7d7

Arrange for holdoff_specified to be set if the holdoff option
is used; make child-timeout option use OPT_PRIO.
---

diff --git a/pppd/options.c b/pppd/options.c
index 4870128..155bcd0 100644
--- a/pppd/options.c
+++ b/pppd/options.c
@@ -40,7 +40,7 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define RCSID	"$Id: options.c,v 1.94 2004/11/04 09:46:50 paulus Exp $"
+#define RCSID	"$Id: options.c,v 1.95 2004/11/09 22:33:35 paulus Exp $"
 
 #include <ctype.h>
 #include <stdio.h>
@@ -199,7 +199,8 @@ option_t general_options[] = {
       OPT_PRIOSUB | OPT_A2CLR | 1, &nodetach },
 
     { "holdoff", o_int, &holdoff,
-      "Set time in seconds before retrying connection", OPT_PRIO },
+      "Set time in seconds before retrying connection",
+      OPT_PRIO, &holdoff_specified },
 
     { "idle", o_int, &idle_time_limit,
       "Set time in seconds before disconnecting idle link", OPT_PRIO },
@@ -272,7 +273,8 @@ option_t general_options[] = {
       "Stop after parsing, printing, and checking options", 1 },
 
     { "child-timeout", o_int, &child_wait,
-      "Number of seconds to wait for child processes at exit" },
+      "Number of seconds to wait for child processes at exit",
+      OPT_PRIO },
 
 #ifdef HAVE_MULTILINK
     { "multilink", o_bool, &multilink,