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 */
static int set_permitted_number (char **);
static void check_access (FILE *, char *);
static int wordlist_count (struct wordlist *);
-
-#ifdef PPP_WITH_MAXOCTETS
static void check_maxoctets (void *);
-#endif
/*
* Authentication-related 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" },
if (auth_script_state == s_up && auth_script_pid == 0) {
update_link_stats(unit);
auth_script_state = s_down;
- auth_script(_PATH_AUTHDOWN);
+ auth_script(PPP_PATH_AUTHDOWN);
}
}
if (!doing_multilink) {
auth_state = s_up;
if (auth_script_state == s_down && auth_script_pid == 0) {
auth_script_state = s_up;
- auth_script(_PATH_AUTHUP);
+ auth_script(PPP_PATH_AUTHUP);
}
}
if (maxconnect > 0)
TIMEOUT(connect_time_expired, 0, maxconnect);
-#ifdef PPP_WITH_MAXOCTETS
if (maxoctets > 0)
TIMEOUT(check_maxoctets, NULL, maxoctets_timeout);
-#endif
/*
* Detach now, if the updetach option was given.
if (--num_np_up == 0) {
UNTIMEOUT(check_idle, NULL);
UNTIMEOUT(connect_time_expired, NULL);
-#ifdef PPP_WITH_MAXOCTETS
UNTIMEOUT(check_maxoctets, NULL);
-#endif
new_phase(PHASE_NETWORK);
}
}
}
}
-#ifdef PPP_WITH_MAXOCTETS
static void
check_maxoctets(void *arg)
{
TIMEOUT(check_maxoctets, NULL, maxoctets_timeout);
}
}
-#endif
/*
* check_idle - check whether the link has been idle for long
* Open the file of pap secrets and scan for a suitable secret
* for authenticating this user.
*/
- filename = _PATH_UPAPFILE;
+ filename = PPP_PATH_UPAPFILE;
addrs = opts = NULL;
ret = UPAP_AUTHNAK;
f = fopen(filename, "r");
* Open the file of pap secrets and scan for a suitable secret.
*/
if (ret <= 0) {
- filename = _PATH_UPAPFILE;
+ filename = PPP_PATH_UPAPFILE;
addrs = NULL;
f = fopen(filename, "r");
if (f == NULL)
return ret;
}
- filename = _PATH_UPAPFILE;
+ filename = PPP_PATH_UPAPFILE;
f = fopen(filename, "r");
if (f == NULL)
return 0;
return ret;
}
- filename = _PATH_UPAPFILE;
+ filename = PPP_PATH_UPAPFILE;
f = fopen(filename, "r");
if (f == NULL)
return 0;
}
}
- filename = _PATH_CHAPFILE;
+ filename = PPP_PATH_CHAPFILE;
f = fopen(filename, "r");
if (f == NULL)
return 0;
char *filename;
struct wordlist *addrs;
- filename = _PATH_SRPFILE;
+ filename = PPP_PATH_SRPFILE;
f = fopen(filename, "r");
if (f == NULL)
return 0;
return 0;
}
} else {
- filename = _PATH_CHAPFILE;
+ filename = PPP_PATH_CHAPFILE;
addrs = NULL;
secbuf[0] = 0;
if (!am_server && passwd[0] != '\0') {
strlcpy(secret, passwd, MAXWORDLEN);
} else {
- filename = _PATH_SRPFILE;
+ filename = PPP_PATH_SRPFILE;
addrs = NULL;
fp = fopen(filename, "r");
case s_up:
if (auth_state == s_down) {
auth_script_state = s_down;
- auth_script(_PATH_AUTHDOWN);
+ auth_script(PPP_PATH_AUTHDOWN);
}
break;
case s_down:
if (auth_state == s_up) {
auth_script_state = s_up;
- auth_script(_PATH_AUTHUP);
+ auth_script(PPP_PATH_AUTHUP);
}
break;
}
char cacertfile[MAXWORDLEN];
char pkfile[MAXWORDLEN];
- filename = _PATH_EAPTLSSERVFILE;
+ filename = PPP_PATH_EAPTLSSERVFILE;
f = fopen(filename, "r");
if (f == NULL)
return 0;
if (pkcs12_file)
return 1;
- filename = _PATH_EAPTLSCLIFILE;
+ filename = PPP_PATH_EAPTLSCLIFILE;
f = fopen(filename, "r");
if (f == NULL)
return 0;
}
else
{
- filename = (am_server ? _PATH_EAPTLSSERVFILE : _PATH_EAPTLSCLIFILE);
+ filename = (am_server ? PPP_PATH_EAPTLSSERVFILE : PPP_PATH_EAPTLSCLIFILE);
addrs = NULL;
fp = fopen(filename, "r");