From 30ca006ae718fcd856ff3fa3783218233a0736aa Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 15 Sep 2003 05:40:21 +0000
Subject: ppp fixes (#104128, #97845, #85447)

---
 src/ppp-watch.c                      | 6 +++---
 sysconfig/network-scripts/ifdown-ppp | 6 ++++--
 sysconfig/network-scripts/ifup-ppp   | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/ppp-watch.c b/src/ppp-watch.c
index 6f27e850..37ad5203 100644
--- a/src/ppp-watch.c
+++ b/src/ppp-watch.c
@@ -609,7 +609,7 @@ main(int argc, char **argv) {
 	    dying = TRUE;
 
 	    /* Get the pid of our child pppd. */
-	    pppLogicalToPhysical(&pppdPid, real_device, NULL);
+	    pppLogicalToPhysical(&pppdPid, device, NULL);
 
 	    /* We don't know what our child pid is.  This is very confusing. */
 	    if (!pppdPid) {
@@ -639,7 +639,7 @@ main(int argc, char **argv) {
 	    ifcfg = shvarfilesGet(device);
 
 	    /* Get the PID of our child pppd. */
-	    pppLogicalToPhysical(&pppdPid, real_device, NULL);
+	    pppLogicalToPhysical(&pppdPid, device, NULL);
 	    kill(pppdPid, SIGTERM);
 
 	    /* We'll redial when the SIGCHLD arrives, even if PERSIST is
@@ -657,7 +657,7 @@ main(int argc, char **argv) {
 	if (theSigio) {
 	    theSigio = 0;
 
-	    pppLogicalToPhysical(NULL, real_device, &physicalDevice);
+	    pppLogicalToPhysical(NULL, device, &physicalDevice);
 	    if (physicalDevice) {
 		if (interfaceIsUp(physicalDevice)) {
 		    /* The interface is up, so report a success to a parent if
diff --git a/sysconfig/network-scripts/ifdown-ppp b/sysconfig/network-scripts/ifdown-ppp
index 4d8cfb75..9455d48a 100755
--- a/sysconfig/network-scripts/ifdown-ppp
+++ b/sysconfig/network-scripts/ifdown-ppp
@@ -11,8 +11,10 @@ if [ "$TYPE" = "xDSL" ] && [ -x /sbin/adsl-stop -o -x /usr/sbin/adsl-stop ] ; th
     exit $?
 fi
 
-if [ "${DEMAND}" = "yes" -a -f /var/run/ppp-${DEVICE}.pid ] ; then
-    PID=`head -1 /var/run/ppp-${DEVICE}.pid`
+CONFIG=${CONFIG##ifcfg-}
+
+if [ "${DEMAND}" = "yes" -a -f /var/run/ppp-${CONFIG}.pid ] ; then
+    PID=`head -1 /var/run/ppp-${CONFIG}.pid`
     kill -TERM ${PID}
     sleep 2
     [ ! -d /proc/${PID} ] && exit 0
diff --git a/sysconfig/network-scripts/ifup-ppp b/sysconfig/network-scripts/ifup-ppp
index 99b0e79f..3d26ebe8 100755
--- a/sysconfig/network-scripts/ifup-ppp
+++ b/sysconfig/network-scripts/ifup-ppp
@@ -18,7 +18,7 @@ else
   if [ "${DEMAND}" != yes -a "$TYPE" != "xDSL" ] ; then
     # let ppp-watch do the right thing
     shift
-    exec /sbin/ppp-watch "${DEVICE}" "$2"
+    exec /sbin/ppp-watch "${CONFIG##ifcfg-}" "$2"
   fi
 fi
 
-- 
cgit v1.2.1