diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | initscripts.spec | 5 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-ippp | 19 |
3 files changed, 26 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2005-09-26 Than Ngo <than@redhat.com> + + * ChangeLog, initscripts.spec: 8.15-1 + + * sysconfig/network-scripts/ifup-ippp: support proper dial-in configuration #158380 + 2005-09-12 Bill Nottingham <notting@redhat.com> * ChangeLog, initscripts.spec: 8.14-1 diff --git a/initscripts.spec b/initscripts.spec index ff67a3d1..9773ce4b 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 8.14 +Version: 8.15 License: GPL Group: System Environment/Base Release: 1 @@ -209,6 +209,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Mon Sep 26 2005 Than Ngo <than@redhat.com> 8.15-1 +- support proper dial-in configuration, thanks to Peter Bieringer (#158380) + * Mon Sep 12 2005 Bill Nottingham <notting@redhat.com> 8.14-1 - fix usage of the module blacklist (#168020) diff --git a/sysconfig/network-scripts/ifup-ippp b/sysconfig/network-scripts/ifup-ippp index 7a72a333..0defdeb6 100755 --- a/sysconfig/network-scripts/ifup-ippp +++ b/sysconfig/network-scripts/ifup-ippp @@ -111,10 +111,11 @@ function addprovider() # set authentication _auth=`echo "$AUTH" | sed 's/[a-z -]*//g'` if [ -n "$_auth" ]; then - if [ -z "$USER" ]; then + if [ -z "$USER" -a "$DIALIN" != "on" ]; then log_echo " Error: $1 (syncppp) user is not set" return 1 fi + if [ "$DIALIN" != "on" ]; then # we should hide the user name, so i add user name to option file. if [ "$AUTH" = "-pap +chap" ]; then create_option_file "name \"$USER\"" @@ -122,6 +123,7 @@ function addprovider() create_option_file "user \"$USER\"" fi options="$options file /etc/ppp/ioption-secret-$DEVICE" + fi # authentication options: # +pap and/or +chap does not work correct by dialout - remove @@ -185,7 +187,9 @@ function addprovider() if [ "$IPADDR" = "0.0.0.0" ]; then options="$options ipcp-accept-local" else + if [ "$DIALIN" != "on" ]; then options="$options noipdefault" + fi fi # Add device options="$options /dev/$DEVICE" @@ -203,7 +207,12 @@ function addprovider() [ -z "$SLAVE_DIALMAX" ] && SLAVE_DIALMAX="$DIALMAX" [ -z "$SLAVE_CALLBACK" ] && SLAVE_CALLBACK="$CALLBACK" [ -z "$SLAVE_CBDELAY" ] && SLAVE_CBDELAY="$CBDELAY" - [ -z "$SLAVE_DIALMODE" ] && SLAVE_DIALMODE="auto" + if [ "$DIALIN" != "on" ] ; then + [ -z "$SLAVE_DIALMODE" ] && SLAVE_DIALMODE="auto" + else + # Master should not dial by default on incoming MPPP + [ -z "$SLAVE_DIALMODE" ] && SLAVE_DIALMODE="$DIALMODE" + fi slave=$SLAVE_DEVICE options="$options /dev/$slave +mp" @@ -249,7 +258,9 @@ function addprovider() fi if [ "$GATEWAY" = "0.0.0.0" ]; then + if [ "$DIALIN" != "on" ]; then options="$options ipcp-accept-remote" + fi options="$IPADDR:$GATEWAY $options" else options="$options $IPADDR:$GATEWAY" @@ -336,7 +347,9 @@ function addprovider() ipppd $options $netmask >/dev/null 2>&1 # start ibod daemon - [ "$BUNDLING" = "yes" -o "$BUNDLING" = "on" ] && [ -n "$SLAVE_DEVICE" ] && start_ibod $DEVICE + if [ "$DIALIN" != "on" ]; then + [ "$BUNDLING" = "yes" -o "$BUNDLING" = "on" ] && [ -n "$SLAVE_DEVICE" ] && start_ibod $DEVICE + fi fi # set default gateway for dial on demand |