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

diff --git a/pppd/ipcp.c b/pppd/ipcp.c
index e9738fe4d894dd9291317412e4a8a93d331db19c..1624450aa41b4e048e7a201445f66e7f6c167d86 100644 (file)
--- 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 0e28606f9ae4caae126f32bcabd49d9ae79ce78e..1be0ad25b67cb1e0dca3a6ce4832c766ecd996fe 100644 (file)
--- 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;