View | Details | Raw Unified | Return to bug 401648
Collapse All | Expand All

(-)file_not_specified_in_diff (-14 / +17 lines)
Line  Link Here
0
-- Changes-2.3
0
++ Changes-2.3
Lines 262-271 Link Here
262
262
263
* Added new option `usepeerdns', thanks to Nick Walker
263
* Added new option `usepeerdns', thanks to Nick Walker
264
  <nickwalker@email.com>.  If the peer supplies DNS addresses, these
264
  <nickwalker@email.com>.  If the peer supplies DNS addresses, these
265
  will be written to /etc/ppp/resolv.conf.  The ip-up script can then
265
  will be written to /var/run/ppp_resolv.conf.$INTERFACE_NAME.
266
  be used to add these addresses to /etc/resolv.conf if desired (see
266
  The ip-up script can then be used to add these addresses to
267
  the ip-up.local.add and ip-down.local.add files in the scripts
267
  /etc/resolv.conf if desired (see the ip-up.local.add and
268
  directory).
268
  ip-down.local.add files in the scripts directory).
269
269
270
* The Solaris ppp driver should now work correctly on SMP systems.
270
* The Solaris ppp driver should now work correctly on SMP systems.
271
271
272
-- pppd/ipcp.c
272
++ pppd/ipcp.c
Lines 2041-2050 Link Here
2041
    u_int32_t peerdns1, peerdns2;
2041
    u_int32_t peerdns1, peerdns2;
2042
{
2042
{
2043
    FILE *f;
2043
    FILE *f;
2044
    char rcfilename[MAXIFNAMELEN];
2044
2045
2045
    f = fopen(_PATH_RESOLV, "w");
2046
    slprintf(rcfilename, sizeof(rcfilename), "%s.%s",
2047
                 _PATH_RESOLV, ifname);
2048
    f = fopen(rcfilename, "w");
2046
    if (f == NULL) {
2049
    if (f == NULL) {
2047
	error("Failed to create %s: %m", _PATH_RESOLV);
2050
	error("Failed to create %s: %m", rcfilename);
2048
	return;
2051
	return;
2049
    }
2052
    }
2050
2053
Lines 2055-2061 Link Here
2055
	fprintf(f, "nameserver %s\n", ip_ntoa(peerdns2));
2058
	fprintf(f, "nameserver %s\n", ip_ntoa(peerdns2));
2056
2059
2057
    if (ferror(f))
2060
    if (ferror(f))
2058
	error("Write failed to %s: %m", _PATH_RESOLV);
2061
	error("Write failed to %s: %m", rcfilename);
2059
2062
2060
    fclose(f);
2063
    fclose(f);
2061
}
2064
}
2062
-- pppd/pathnames.h
2065
++ pppd/pathnames.h
Lines 30-36 Link Here
30
#define _PATH_TTYOPT	 _ROOT_PATH "/etc/ppp/options."
30
#define _PATH_TTYOPT	 _ROOT_PATH "/etc/ppp/options."
31
#define _PATH_CONNERRS	 _ROOT_PATH "/etc/ppp/connect-errors"
31
#define _PATH_CONNERRS	 _ROOT_PATH "/etc/ppp/connect-errors"
32
#define _PATH_PEERFILES	 _ROOT_PATH "/etc/ppp/peers/"
32
#define _PATH_PEERFILES	 _ROOT_PATH "/etc/ppp/peers/"
33
#define _PATH_RESOLV	 _ROOT_PATH "/etc/ppp/resolv.conf"
33
#define _PATH_RESOLV	 _ROOT_PATH "/var/run/ppp_resolv.conf"
34
34
35
#define _PATH_USEROPT	 ".ppprc"
35
#define _PATH_USEROPT	 ".ppprc"
36
#define	_PATH_PSEUDONYM	 ".ppp_pseudonym"
36
#define	_PATH_PSEUDONYM	 ".ppp_pseudonym"
37
-- pppd/pppd.8
37
++ pppd/pppd.8
Lines 1062-1069 Link Here
1062
by the peer (if any) are passed to the /etc/ppp/ip\-up script in the
1062
by the peer (if any) are passed to the /etc/ppp/ip\-up script in the
1063
environment variables DNS1 and DNS2, and the environment variable
1063
environment variables DNS1 and DNS2, and the environment variable
1064
USEPEERDNS will be set to 1.  In addition, pppd will create an
1064
USEPEERDNS will be set to 1.  In addition, pppd will create an
1065
/etc/ppp/resolv.conf file containing one or two nameserver lines with
1065
/var/run/ppp_resolv.conf.$INTERFACE file containing one or two nameserver
1066
the address(es) supplied by the peer.
1066
lines with the address(es) supplied by the peer.
1067
.TP
1067
.TP
1068
.B user \fIname
1068
.B user \fIname
1069
Sets the name used for authenticating the local system to the peer to
1069
Sets the name used for authenticating the local system to the peer to

Return to bug 401648