From: Paul Mackerras <paulus@ozlabs.org>
Date: Sat, 23 Jun 2018 10:36:22 +0000 (+1000)
Subject: Merge branch 'pppd_print_changes' of https://github.com/nlhintz/ppp into nlhintz... 
X-Git-Tag: ppp-2.4.8~30
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=d98ab3805c818bfb58e20ee18e6488a851c1a90d;hp=5c765a67fd25f9d84e71ed61ace37c8c97f6be15;p=ppp.git

Merge branch 'pppd_print_changes' of https://github.com/nlhintz/ppp into nlhintz-pppd_print_changes
---

diff --git a/pppd/ipcp.c b/pppd/ipcp.c
index e9738fe..1624450 100644
--- a/pppd/ipcp.c
+++ b/pppd/ipcp.c
@@ -175,10 +175,10 @@ static option_t ipcp_option_list[] = {
     { "noipdefault", o_bool, &disable_defaultip,
       "Don't use name for default IP adrs", 1 },
 
-    { "ms-dns", 1, (void *)setdnsaddr,
-      "DNS address for the peer's use" },
-    { "ms-wins", 1, (void *)setwinsaddr,
-      "Nameserver for SMB over TCP/IP for peer" },
+    { "ms-dns", o_special, (void *)setdnsaddr,
+      "DNS address for the peer's use", OPT_A2LIST },
+    { "ms-wins", o_special, (void *)setwinsaddr,
+      "Nameserver for SMB over TCP/IP for peer", OPT_A2LIST },
 
     { "ipcp-restart", o_int, &ipcp_fsm[0].timeouttime,
       "Set timeout for IPCP", OPT_PRIO },
diff --git a/pppd/plugins/pppol2tp/pppol2tp.c b/pppd/plugins/pppol2tp/pppol2tp.c
index 0e28606..1be0ad2 100644
--- a/pppd/plugins/pppol2tp/pppol2tp.c
+++ b/pppd/plugins/pppol2tp/pppol2tp.c
@@ -148,6 +148,10 @@ static int setdevname_pppol2tp(char **argv)
 		fatal("PPPoL2TP kernel driver not installed");
 	}
 
+	pppol2tp_fd_str = strdup(*argv);
+	if (pppol2tp_fd_str == NULL)
+		novm("PPPoL2TP FD");
+
 	/* Setup option defaults. Compression options are disabled! */
 
 	modem = 0;