4505baafb8
* New pppd options have been added:
* ifname, to set the name for the PPP interface device
* defaultroute-metric, to set the metric for the default route
* defaultroute6, to add an IPv6 default route (with
nodefaultroute6 to prevent adding an IPv6 default route).
* up_sdnotify, to have pppd notify systemd when the link is up.
* The rp-pppoe plugin has new options:
* host-uniq, to set the Host-Uniq value to send
* pppoe-padi-timeout, to set the timeout for discovery packets
* pppoe-padi-attempts, to set the number of discovery attempts.
* Added the CLASS attribute in radius packets.
* Fixed warnings and issues found by static analysis.
- Obsoleted patches:
[...]
- Patches that got renamed, because they needed rediffing:
[...]
- bsc#1172916: Fix an outdated comment for lcp-echo-interval.
OBS-URL: https://build.opensuse.org/package/show/network/ppp?expand=0&rev=60
69 lines
2.5 KiB
Diff
69 lines
2.5 KiB
Diff
--- Changes-2.3.orig
|
|
+++ Changes-2.3
|
|
@@ -262,10 +262,10 @@ What was new in ppp-2.3.6.
|
|
|
|
* Added new option `usepeerdns', thanks to Nick Walker
|
|
<nickwalker@email.com>. If the peer supplies DNS addresses, these
|
|
- will be written to /etc/ppp/resolv.conf. The ip-up script can then
|
|
- be used to add these addresses to /etc/resolv.conf if desired (see
|
|
- the ip-up.local.add and ip-down.local.add files in the scripts
|
|
- directory).
|
|
+ will be written to /var/run/ppp_resolv.conf.$INTERFACE_NAME.
|
|
+ The ip-up script can then be used to add these addresses to
|
|
+ /etc/resolv.conf if desired (see the ip-up.local.add and
|
|
+ ip-down.local.add files in the scripts directory).
|
|
|
|
* The Solaris ppp driver should now work correctly on SMP systems.
|
|
|
|
--- pppd/ipcp.c.orig
|
|
+++ pppd/ipcp.c
|
|
@@ -2148,10 +2148,13 @@ create_resolv(peerdns1, peerdns2)
|
|
u_int32_t peerdns1, peerdns2;
|
|
{
|
|
FILE *f;
|
|
+ char rcfilename[MAXIFNAMELEN];
|
|
|
|
- f = fopen(_PATH_RESOLV, "w");
|
|
+ slprintf(rcfilename, sizeof(rcfilename), "%s.%s",
|
|
+ _PATH_RESOLV, ifname);
|
|
+ f = fopen(rcfilename, "w");
|
|
if (f == NULL) {
|
|
- error("Failed to create %s: %m", _PATH_RESOLV);
|
|
+ error("Failed to create %s: %m", rcfilename);
|
|
return;
|
|
}
|
|
|
|
@@ -2162,7 +2165,7 @@ create_resolv(peerdns1, peerdns2)
|
|
fprintf(f, "nameserver %s\n", ip_ntoa(peerdns2));
|
|
|
|
if (ferror(f))
|
|
- error("Write failed to %s: %m", _PATH_RESOLV);
|
|
+ error("Write failed to %s: %m", rcfilename);
|
|
|
|
fclose(f);
|
|
}
|
|
--- pppd/pathnames.h.orig
|
|
+++ pppd/pathnames.h
|
|
@@ -30,7 +30,7 @@
|
|
#define _PATH_TTYOPT _ROOT_PATH "/etc/ppp/options."
|
|
#define _PATH_CONNERRS _ROOT_PATH "/etc/ppp/connect-errors"
|
|
#define _PATH_PEERFILES _ROOT_PATH "/etc/ppp/peers/"
|
|
-#define _PATH_RESOLV _ROOT_PATH "/etc/ppp/resolv.conf"
|
|
+#define _PATH_RESOLV _ROOT_PATH "/var/run/ppp_resolv.conf"
|
|
|
|
#define _PATH_USEROPT ".ppprc"
|
|
#define _PATH_PSEUDONYM ".ppp_pseudonym"
|
|
--- pppd/pppd.8.orig
|
|
+++ pppd/pppd.8
|
|
@@ -1143,8 +1143,8 @@ Ask the peer for up to 2 DNS server addr
|
|
by the peer (if any) are passed to the /etc/ppp/ip\-up script in the
|
|
environment variables DNS1 and DNS2, and the environment variable
|
|
USEPEERDNS will be set to 1. In addition, pppd will create an
|
|
-/etc/ppp/resolv.conf file containing one or two nameserver lines with
|
|
-the address(es) supplied by the peer.
|
|
+/var/run/ppp_resolv.conf.$INTERFACE file containing one or two nameserver
|
|
+lines with the address(es) supplied by the peer.
|
|
.TP
|
|
.B user \fIname
|
|
Sets the name used for authenticating the local system to the peer to
|