make sure plugins get installed in the right place

[ppp.git] / pppd / plugins / rp-pppoe / plugin.c

diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c
index 00316ae5050979482e2c8f2925ec8d354f0c2f63..cd93bfa1887dcd30bf6bcb508305dc3bae5e78ca 100644 (file)
--- a/pppd/plugins/rp-pppoe/plugin.c
+++ b/pppd/plugins/rp-pppoe/plugin.c
@@ -22,7 +22,7 @@
 ***********************************************************************/
 
 static char const RCSID[] =
-"$Id: plugin.c,v 1.10 2004/01/13 04:03:58 paulus Exp $";
+"$Id: plugin.c,v 1.12 2004/11/04 10:07:37 paulus Exp $";
 
 #define _GNU_SOURCE 1
 #include "pppoe.h"
@@ -80,7 +80,7 @@ static option_t Options[] = {
       "Be verbose about discovered access concentrators"},
     { NULL }
 };
-int (*OldDevnameHook)(char *cmd, char **argv, int doit) = NULL;
+
 static PPPoEConnection *conn = NULL;
 
 /**********************************************************************
@@ -244,6 +244,8 @@ PPPOEDisconnectDevice(void)
        return;
     }
     close(conn->sessionSocket);
+    /* don't send PADT?? */
+    close(conn->discoverySocket);
 }
 
 static void
@@ -283,9 +285,9 @@ PPPoEDevnameHook(char *cmd, char **argv, int doit)
     if (strlen(cmd) > 4 && !strncmp(cmd, "nic-", 4)) {
        /* Strip off "nic-" */
        cmd += 4;
-    } else if (strlen(cmd) < 4 || (strncmp(cmd, "eth", 3) &&
-               strncmp(cmd, "nas", 3) && strncmp(cmd, "tap", 3))) {
-       if (OldDevnameHook) return OldDevnameHook(cmd, argv, doit);
+    } else if (strlen(cmd) < 4
+              || (strncmp(cmd, "eth", 3) && strncmp(cmd, "nas", 3)
+                  && strncmp(cmd, "tap", 3) && strncmp(cmd, "br", 2))) {
        return 0;
     }
 
@@ -343,7 +345,6 @@ PPPoEDevnameHook(char *cmd, char **argv, int doit)
        return 1;
     }
 
-    if (OldDevnameHook) r = OldDevnameHook(cmd, argv, doit);
     return r;
 }