From: David F. Skoll <dfs@roaringpenguin.com>
Date: Wed, 27 Feb 2002 16:00:30 +0000 (+0000)
Subject: Service-name was not being set correctly in PPPoE plugin.
X-Git-Tag: ppp-2.4.7~443
X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=de87fc02dd7cc8518d50edfd9f9dd4a32bb74703;ds=sidebyside

Service-name was not being set correctly in PPPoE plugin.
---

diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c
index afb6b09..e97d06a 100644
--- 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.3 2002/02/12 04:36:00 mostrows Exp $";
+"$Id: plugin.c,v 1.4 2002/02/27 16:00:30 dfs Exp $";
 
 #define _GNU_SOURCE 1
 #include "pppoe.h"
@@ -59,7 +59,7 @@ char pppd_version[] = VERSION;
 /* From sys-linux.c in pppd -- MUST FIX THIS! */
 extern int new_style_driver;
 
-static char *service = NULL;
+char *pppd_pppoe_service = NULL;
 static char *acName = NULL;
 static char *existingSession = NULL;
 static int printACNames = 0;
@@ -70,7 +70,7 @@ static option_t Options[] = {
       "PPPoE device name",
       OPT_DEVNAM | OPT_PRIVFIX | OPT_NOARG  | OPT_A2STRVAL | OPT_STATIC,
       devnam},
-    { "rp_pppoe_service", o_string, &service,
+    { "rp_pppoe_service", o_string, &pppd_pppoe_service,
       "Desired PPPoE service name" },
     { "rp_pppoe_ac",      o_string, &acName,
       "Desired PPPoE access concentrator name" },
@@ -103,8 +103,8 @@ PPPOEInitDevice(void)
     if (acName) {
 	SET_STRING(conn->acName, acName);
     }
-    if (service) {
-	SET_STRING(conn->serviceName, acName);
+    if (pppd_pppoe_service) {
+	SET_STRING(conn->serviceName, pppd_pppoe_service);
     }
     SET_STRING(conn->ifName, devnam);
     conn->discoverySocket = -1;