X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fccp.c;h=088a163c3f68370623b09ee3ecf61ea6436ca419;hb=509f04959ad891d7f981f035ed461d51bd1f74b0;hp=36ee5496d33b530de45fb6df64bbca85207fa85d;hpb=e8676075aea6d278f435d5ce83d9b6aa216a1ecb;p=ppp.git diff --git a/pppd/ccp.c b/pppd/ccp.c index 36ee549..088a163 100644 --- a/pppd/ccp.c +++ b/pppd/ccp.c @@ -36,11 +36,15 @@ #include #include +#if defined(SOL2) +#include +#else +#include +#endif #include "pppd.h" #include "fsm.h" #include "ccp.h" -#include #include "chap_ms.h" #include "mppe.h" @@ -525,7 +529,7 @@ ccp_resetci(fsm *f) if (go->mppe) { ccp_options *ao = &ccp_allowoptions[f->unit]; int auth_mschap_bits = auth_done[f->unit]; -#ifdef USE_EAPTLS +#ifdef PPP_WITH_EAPTLS int auth_eap_bits = auth_done[f->unit]; #endif int numbits; @@ -556,7 +560,7 @@ ccp_resetci(fsm *f) return; } -#ifdef USE_EAPTLS +#ifdef PPP_WITH_EAPTLS /* * MPPE is also possible in combination with EAP-TLS. * It is not possible to detect if we're doing EAP or EAP-TLS