magic: Remove K&R style of arguments

[ppp.git] / pppd / multilink.c

diff --git a/pppd/multilink.c b/pppd/multilink.c
index b4748cd6c885d30b023b5efd6d0f338f46429a0a..c49c4465ced8f1b65d3be54c35b71c000c0ac33b 100644 (file)
--- a/pppd/multilink.c
+++ b/pppd/multilink.c
@@ -278,8 +278,11 @@ void mp_bundle_terminated()
        key.dsize = strlen(blinks_id);
        tdb_delete(pppdb, key);
        unlock_db();
-       
-new_phase(PHASE_DEAD);
+
+       new_phase(PHASE_DEAD);
+
+       doing_multilink = 0;
+       multilink_master = 0;
 }
 
 static void make_bundle_links(int append)
@@ -442,9 +445,13 @@ get_default_epdisc(ep)
        if (p != 0 && get_if_hwaddr(ep->value, p) >= 0) {
                ep->class = EPD_MAC;
                ep->length = 6;
+               free(p);
                return 1;
        }
 
+       if (p)
+               free(p);
+
        /* see if our hostname corresponds to a reasonable IP address */
        hp = gethostbyname(hostname);
        if (hp != NULL) {