d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the MPPE MasterKey Invalid messages a bit clearer (it now

Browse Source 
complains that you can't do MPPE without CHAP81).

Reset MasterKeyValid to zero when we hit phase DEAD.
This commit is contained in:
Brian Somers 2001-02-04 01:08:24 +00:00
parent 2fc2f70582
commit 019d32bf74
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=71971
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/ppp/bundle.c
View File

@ -97,6 +97,7 @@
#include "ip.h"
#include "iface.h"
#include "server.h"
#include "mppe.h"
#define SCATTER_SEGMENTS 7 /* version, datalink, name, physical,
throughput, throughput, device */
@ -128,8 +129,9 @@ bundle_NewPhase(struct bundle *bundle, u_int new)
switch (new) {
case PHASE_DEAD:
log_DisplayPrompts();
bundle->phase = new;
MPPE_MasterKeyValid = 0;
log_DisplayPrompts();
break;
case PHASE_ESTABLISH:

6
usr.sbin/ppp/mppe.c
View File

@ -234,7 +234,7 @@ MPPEInitOptsOutput(struct lcp_opt *o, const struct ccp_config *cfg)
if (!MPPE_MasterKeyValid) {
log_Printf(LogCCP, "MPPE: MasterKey is invalid,"
" MPPE is capable only with CHAP81 authentication\n");
" MPPE is available only with CHAP81 authentication\n");
*(u_int32_t *)o->data = htonl(0x0);
return;
}
@ -321,7 +321,7 @@ MPPEInitInput(struct lcp_opt *o)
log_Printf(LogCCP, "MPPE: InitInput\n");
if (!MPPE_MasterKeyValid) {
log_Printf(LogERROR, "MPPE: InitInput: MasterKey is invalid!!!!\n");
log_Printf(LogWARN, "MPPE: Cannot initialise without CHAP81\n");
return NULL;
}
@ -363,7 +363,7 @@ MPPEInitOutput(struct lcp_opt *o)
log_Printf(LogCCP, "MPPE: InitOutput\n");
if (!MPPE_MasterKeyValid) {
log_Printf(LogERROR, "MPPE: InitOutput: MasterKey is invalid!!!!\n");
log_Printf(LogWARN, "MPPE: Cannot initialise without CHAP81\n");
return NULL;
}