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

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

Reset MasterKeyValid to zero when we hit phase DEAD.

2 files changed, 6 insertions, 4 deletions

diff --git a/usr.sbin/ppp/bundle.c b/usr.sbin/ppp/bundle.c
index 34f7a02..85e0877 100644
--- a/usr.sbin/ppp/bundle.c
+++ b/usr.sbin/ppp/bundle.c
@@ -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:
diff --git a/usr.sbin/ppp/mppe.c b/usr.sbin/ppp/mppe.c
index 158eabb..cbda453 100644
--- a/usr.sbin/ppp/mppe.c
+++ b/usr.sbin/ppp/mppe.c
@@ -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;
   }