X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fauth.c;h=1e9cba09825555ad6146c984ebd1e739cad97796;hb=1d3327b87170d5d8db4a5ad06b465925cff4488a;hp=f443a2937f1dd0cc3c4ff53a57ba0a8c8403656a;hpb=b2c21894e165d7a0b4f1600fd8a8fd1b21305752;p=ppp.git

diff --git a/pppd/auth.c b/pppd/auth.c
index f443a29..1e9cba0 100644
--- a/pppd/auth.c
+++ b/pppd/auth.c
@@ -259,7 +259,7 @@ bool explicit_user = 0;		/* Set if "user" option supplied */
 bool explicit_passwd = 0;	/* Set if "password" option supplied */
 char remote_name[MAXNAMELEN];	/* Peer's name for authentication */
 
-#if defined(PPP_WITH_EAPTLS) || defined(USE_PEAP)
+#if defined(PPP_WITH_EAPTLS) || defined(PPP_WITH_PEAP)
 char *cacert_file  = NULL;  /* CA certificate file (pem format) */
 char *ca_path      = NULL;  /* Directory with CA certificates */
 char *crl_dir      = NULL;  /* Directory containing CRL files */
@@ -318,7 +318,7 @@ static int  set_permitted_number (char **);
 static void check_access (FILE *, char *);
 static int  wordlist_count (struct wordlist *);
 
-#ifdef MAXOCTETS
+#ifdef PPP_WITH_MAXOCTETS
 static void check_maxoctets (void *);
 #endif
 
@@ -449,7 +449,7 @@ option_t auth_options[] = {
       "Set telephone number(s) which are allowed to connect",
       OPT_PRIV | OPT_A2LIST },
 
-#if defined(PPP_WITH_EAPTLS) || defined(USE_PEAP)
+#if defined(PPP_WITH_EAPTLS) || defined(PPP_WITH_PEAP)
     { "ca", o_string, &cacert_file,     "CA certificate in PEM format" },
     { "capath", o_string, &ca_path,     "TLS CA certificate directory" },
     { "crl-dir", o_string, &crl_dir,    "Use CRLs in directory" },
@@ -1164,7 +1164,7 @@ np_up(int unit, int proto)
 	if (maxconnect > 0)
 	    TIMEOUT(connect_time_expired, 0, maxconnect);
 
-#ifdef MAXOCTETS
+#ifdef PPP_WITH_MAXOCTETS
 	if (maxoctets > 0)
 	    TIMEOUT(check_maxoctets, NULL, maxoctets_timeout);
 #endif
@@ -1194,7 +1194,7 @@ np_down(int unit, int proto)
     if (--num_np_up == 0) {
 	UNTIMEOUT(check_idle, NULL);
 	UNTIMEOUT(connect_time_expired, NULL);
-#ifdef MAXOCTETS
+#ifdef PPP_WITH_MAXOCTETS
 	UNTIMEOUT(check_maxoctets, NULL);
 #endif	
 	new_phase(PHASE_NETWORK);
@@ -1213,7 +1213,7 @@ np_finished(int unit, int proto)
     }
 }
 
-#ifdef MAXOCTETS
+#ifdef PPP_WITH_MAXOCTETS
 static void
 check_maxoctets(void *arg)
 {