Bug 158380
Summary: | ifup-ippp doesn't support proper dial-in configuration | ||||||
---|---|---|---|---|---|---|---|
Product: | [Fedora] Fedora | Reporter: | Peter Bieringer <pb> | ||||
Component: | initscripts | Assignee: | Bill Nottingham <notting> | ||||
Status: | CLOSED RAWHIDE | QA Contact: | Brock Organ <borgan> | ||||
Severity: | medium | Docs Contact: | |||||
Priority: | medium | ||||||
Version: | 3 | CC: | rvokal, than | ||||
Target Milestone: | --- | ||||||
Target Release: | --- | ||||||
Hardware: | All | ||||||
OS: | Linux | ||||||
Whiteboard: | |||||||
Fixed In Version: | Doc Type: | Bug Fix | |||||
Doc Text: | Story Points: | --- | |||||
Clone Of: | Environment: | ||||||
Last Closed: | 2005-09-26 09:01:38 UTC | Type: | --- | ||||
Regression: | --- | Mount Type: | --- | ||||
Documentation: | --- | CRM: | |||||
Verified Versions: | Category: | --- | |||||
oVirt Team: | --- | RHEL 7.3 requirements from Atomic Host: | |||||
Cloudforms Team: | --- | Target Upstream Version: | |||||
Embargoed: | |||||||
Attachments: |
|
Description
Peter Bieringer
2005-05-21 10:16:13 UTC
Created attachment 114667 [details]
Patch for proper support of dial-in
Here explanation of the patch:
@@ -111,10 +111,11 @@
# 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
Dial-In doesn't require a USER, btw. without this fix this lead also to a
strange behavior, because it's working after login (because here USER=root in
environment) while not working during booting called by init.
+ 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 @@
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
No secret file is required in dial-in case, authentication data is stored in
/etc/ppp/{pap,chap}-secrets.
@@ -185,7 +187,9 @@
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"
noipdefault isn't working in dial-in case.
@@ -249,7 +253,9 @@
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"
dial-in-case shoudn't accept remote IP address by default.
Note that DIALIN variable already occurs in ifup-ippp, so it is not introduced
by me. But it is not described at all in sysconfig.txt at "IPPP-specific items
(ISDN)".
The feature dialin-server is not supported well in fc3. I suggest this feature should be added in fc5. Many thanks for the patch 2 additional patches are needed to support channel bundling proper: Do not set slave device in dialmode=auto for server config: @@ -203,7 +207,12 @@ [ -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" Do not start ibod in server mode and channel bundling, makes no sense, client should do that only (it knows the number...) @@ -336,7 +347,9 @@ ipppd $options $netmask >/dev/null 2>&1 # start ibod daemon + if [ "$DIALIN" != "on" ]; then [ "$BUNDLING" = "yes" -o "$BUNDLING" = "on" ] && [ -n "$SLAVE_DEVICE" ] && start_ibod $DEVICE + fi fi # set default gateway for dial on demand it's now fixed in initscript-8.15-1 n rawhide. Many thanks for the patch |