Fix situation where peer may NAK with request for MS_WINS

Previously, if configure-request is sent without MS_WINS[12], a
peer may return a NAK with a request for it. However, code in the
ipcp_nakci didn't handle this case properly. This patch fixes it
to set try.req_wins[12].

Signed-off-by: Michael Everitt <michael@2e0cer.net>

diff --git a/pppd/ipcp.c b/pppd/ipcp.c
index 7db51564990645d4f148dcf01f9d6e91c056d274..6e0d5f66f57c86b5572b315cb434a65166caabd2 100644 (file)
--- a/pppd/ipcp.c
+++ b/pppd/ipcp.c
@@ -1240,13 +1240,20 @@ ipcp_nakci(fsm *f, u_char *p, int len, int treat_as_reject)
            no.req_dns2 = 1;
            break;
        case CI_MS_WINS1:
+           if (go->req_wins1 || no.req_wins1 || cilen != CILEN_ADDR)
+               goto bad;
+           GETLONG(l, p);
+           try.winsaddr[0] = htonl(l);
+           try.req_wins1 = 1;
+           no.req_wins1 = 1;
+           break;
        case CI_MS_WINS2:
-           if (cilen != CILEN_ADDR)
+           if (go->req_wins2 || no.req_wins2 || cilen != CILEN_ADDR)
                goto bad;
            GETLONG(l, p);
-           ciaddr1 = htonl(l);
-           if (ciaddr1)
-               try.winsaddr[citype == CI_MS_WINS2] = ciaddr1;
+           try.winsaddr[1] = htonl(l);
+           try.req_wins2 = 1;
+           no.req_wins2 = 1;
            break;
        }
        p = next;