summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authorbrian <brian@FreeBSD.org>2001-01-22 01:43:46 +0000
committerbrian <brian@FreeBSD.org>2001-01-22 01:43:46 +0000
commit0b427e62c3df33d059a3f6d0208a9fc6b7251f3c (patch)
tree6d48fcc51a444afdbce92f752fafb076c629708c /usr.sbin
parent64445bb95aef0b985530c029ca510c23e5f4bead (diff)
downloadFreeBSD-src-0b427e62c3df33d059a3f6d0208a9fc6b7251f3c.zip
FreeBSD-src-0b427e62c3df33d059a3f6d0208a9fc6b7251f3c.tar.gz
Handle SECDNS being rejected when PRIDNS is not
Submitted by: OGAWA Takaya <t-ogawa@triaez.kaisei.org> PR: 24518
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/ppp/ipcp.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.sbin/ppp/ipcp.c b/usr.sbin/ppp/ipcp.c
index 1f5b2f1..6369a48 100644
--- a/usr.sbin/ppp/ipcp.c
+++ b/usr.sbin/ppp/ipcp.c
@@ -871,10 +871,13 @@ IpcpSendConfigReq(struct fsm *fp)
}
if (IsEnabled(ipcp->cfg.ns.dns_neg) &&
- !REJECTED(ipcp, TY_PRIMARY_DNS - TY_ADJUST_NS) &&
- !REJECTED(ipcp, TY_SECONDARY_DNS - TY_ADJUST_NS)) {
+ !REJECTED(ipcp, TY_PRIMARY_DNS - TY_ADJUST_NS)) {
memcpy(o->data, &ipcp->dns[0].s_addr, 4);
INC_LCP_OPT(TY_PRIMARY_DNS, 6, o);
+ }
+
+ if (IsEnabled(ipcp->cfg.ns.dns_neg) &&
+ !REJECTED(ipcp, TY_SECONDARY_DNS - TY_ADJUST_NS)) {
memcpy(o->data, &ipcp->dns[1].s_addr, 4);
INC_LCP_OPT(TY_SECONDARY_DNS, 6, o);
}
OpenPOWER on IntegriCloud