| 1 |
slords |
1.1 |
diff -urNp --exclude-from=/mdomsch2/excludes --minimal ppp-2.4.3.orig/pppd/pppd.8 ppp-2.4.3/pppd/pppd.8 |
| 2 |
|
|
--- ppp-2.4.3.orig/pppd/pppd.8 2004-11-13 06:22:49.000000000 -0600 |
| 3 |
|
|
+++ ppp-2.4.3/pppd/pppd.8 2005-08-03 22:10:34.000000000 -0500 |
| 4 |
|
|
@@ -1035,7 +1035,7 @@ Ask the peer for up to 2 DNS server addr |
| 5 |
|
|
by the peer (if any) are passed to the /etc/ppp/ip\-up script in the |
| 6 |
|
|
environment variables DNS1 and DNS2, and the environment variable |
| 7 |
|
|
USEPEERDNS will be set to 1. In addition, pppd will create an |
| 8 |
|
|
-/etc/ppp/resolv.conf file containing one or two nameserver lines with |
| 9 |
|
|
+/var/run/ppp/resolv.conf file containing one or two nameserver lines with |
| 10 |
|
|
the address(es) supplied by the peer. |
| 11 |
|
|
.TP |
| 12 |
|
|
.B user \fIname |
| 13 |
|
|
--- ppp-2.4.2/scripts/ip-down.local.add.change_resolv_conf 1999-02-27 05:32:42.000000000 +0100 |
| 14 |
|
|
+++ ppp-2.4.2/scripts/ip-down.local.add 2004-09-14 14:36:20.058008752 +0200 |
| 15 |
|
|
@@ -9,12 +9,13 @@ |
| 16 |
|
|
# |
| 17 |
|
|
# Nick Walker (nickwalker@email.com) |
| 18 |
|
|
# |
| 19 |
|
|
+. /etc/sysconfig/network-scripts/network-functions |
| 20 |
|
|
|
| 21 |
|
|
-if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then |
| 22 |
|
|
- if [ -f /etc/ppp/resolv.prev ]; then |
| 23 |
|
|
- cp -f /etc/ppp/resolv.prev /etc/resolv.conf |
| 24 |
|
|
+if [ -n "$USEPEERDNS" -a -f /var/run/ppp/resolv.conf ]; then |
| 25 |
|
|
+ if [ -f /var/run/ppp/resolv.prev ]; then |
| 26 |
|
|
+ change_resolv_conf /var/run/ppp/resolv.prev |
| 27 |
|
|
else |
| 28 |
|
|
- rm -f /etc/resolv.conf |
| 29 |
|
|
+ change_resolv_conf |
| 30 |
|
|
fi |
| 31 |
|
|
fi |
| 32 |
|
|
|
| 33 |
|
|
--- ppp-2.4.2/scripts/ip-up.local.add.change_resolv_conf 1999-11-15 04:28:10.000000000 +0100 |
| 34 |
|
|
+++ ppp-2.4.2/scripts/ip-up.local.add 2004-09-14 14:37:39.129061828 +0200 |
| 35 |
|
|
@@ -9,16 +9,19 @@ |
| 36 |
|
|
# |
| 37 |
|
|
# Nick Walker (nickwalker@email.com) |
| 38 |
|
|
# |
| 39 |
|
|
+. /etc/sysconfig/network-scripts/network-functions |
| 40 |
|
|
|
| 41 |
|
|
-if [ -n "$USEPEERDNS" -a -f /etc/ppp/resolv.conf ]; then |
| 42 |
|
|
- rm -f /etc/ppp/resolv.prev |
| 43 |
|
|
+if [ -n "$USEPEERDNS" -a -f /var/run/ppp/resolv.conf ]; then |
| 44 |
|
|
+ rm -f /var/run/ppp/resolv.prev |
| 45 |
|
|
if [ -f /etc/resolv.conf ]; then |
| 46 |
|
|
- cp /etc/resolv.conf /etc/ppp/resolv.prev |
| 47 |
|
|
- grep domain /etc/ppp/resolv.prev > /etc/resolv.conf |
| 48 |
|
|
- grep search /etc/ppp/resolv.prev >> /etc/resolv.conf |
| 49 |
|
|
- cat /etc/ppp/resolv.conf >> /etc/resolv.conf |
| 50 |
|
|
+ cp /etc/resolv.conf /var/run/ppp/resolv.prev |
| 51 |
|
|
+ rscf=/var/run/ppp/resolv.new |
| 52 |
|
|
+ grep domain /var/run/ppp/resolv.prev > $rscf |
| 53 |
|
|
+ grep search /var/run/ppp/resolv.prev >> $rscf |
| 54 |
|
|
+ change_resolv_conf $rscf |
| 55 |
|
|
+ rm -f $rscf |
| 56 |
|
|
else |
| 57 |
|
|
- cp /etc/ppp/resolv.conf /etc |
| 58 |
|
|
+ change_resolv_conf /var/run/ppp/resolv.conf |
| 59 |
|
|
fi |
| 60 |
|
|
fi |
| 61 |
|
|
|
Parent Directory
| 
Revision Log
| 
Revision Graph
