X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fpppd.h;h=9dc6d714a59b2138c2133950218ad8dec0dfb7ca;hb=bdd34ab1f2f87acb23c6d92feee7354ac53005ff;hp=a20bf0d36b1bbc16eb8cd93944950cd512db3ffa;hpb=b2c21894e165d7a0b4f1600fd8a8fd1b21305752;p=ppp.git diff --git a/pppd/pppd.h b/pppd/pppd.h index a20bf0d..9dc6d71 100644 --- a/pppd/pppd.h +++ b/pppd/pppd.h @@ -60,7 +60,6 @@ #include /* for struct timeval */ #include #include -#include "patchlevel.h" #ifdef PPP_WITH_IPV6CP #include "eui64.h" @@ -340,7 +339,7 @@ extern char path_ipv6up[]; /* pathname of ipv6-up script */ extern char path_ipv6down[]; /* pathname of ipv6-down script */ #endif -#if defined(PPP_WITH_EAPTLS) || defined(USE_PEAP) +#if defined(PPP_WITH_EAPTLS) || defined(PPP_WITH_PEAP) #define TLS_VERIFY_NONE "none" #define TLS_VERIFY_NAME "name" #define TLS_VERIFY_SUBJECT "subject" @@ -354,13 +353,13 @@ extern char *cacert_file; extern char *max_tls_version; extern bool tls_verify_key_usage; extern char *tls_verify_method; -#endif /* PPP_WITH_EAPTLS || USE_PEAP */ +#endif /* PPP_WITH_EAPTLS || PPP_WITH_PEAP */ #ifdef PPP_WITH_EAPTLS extern char *pkcs12_file; #endif /* PPP_WITH_EAPTLS */ -#ifdef MAXOCTETS +#ifdef PPP_WITH_MAXOCTETS extern unsigned int maxoctets; /* Maximum octetes per session (in bytes) */ extern int maxoctets_dir; /* Direction : 0 - in+out (default) @@ -869,7 +868,7 @@ extern void (*snoop_send_hook)(unsigned char *p, int len); #define EXIT_LOOPBACK 17 #define EXIT_INIT_FAILED 18 #define EXIT_AUTH_TOPEER_FAILED 19 -#ifdef MAXOCTETS +#ifdef PPP_WITH_MAXOCTETS #define EXIT_TRAFFIC_LIMIT 20 #endif #define EXIT_CNID_AUTH_FAILED 21