quiet the compiler, at the expense of #ifdef madness

[ppp.git] / pppd / chap.c

diff --git a/pppd/chap.c b/pppd/chap.c
index 4e800be21847fb75e45549c5168866fb6abd682a..0ac0a8b9199d542a9e85c39ed41c93edca688185 100644 (file)
--- a/pppd/chap.c
+++ b/pppd/chap.c
@@ -49,7 +49,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define RCSID  "$Id: chap.c,v 1.38 2002/12/04 23:03:32 paulus Exp $"
+#define RCSID  "$Id: chap.c,v 1.40 2003/05/12 07:47:06 fcusack Exp $"
 
 /*
  * TODO:
@@ -100,6 +100,7 @@ static option_t chap_option_list[] = {
       "Set max #xmits for challenge", OPT_PRIO },
     { "chap-interval", o_int, &chap[0].chal_interval,
       "Set interval for rechallenge", OPT_PRIO },
+#ifdef MSCHAP
 #ifdef MSLANMAN
     { "ms-lanman", o_bool, &ms_lanman,
       "Use LanMan passwd when using MS-CHAP", 1 },
@@ -109,6 +110,7 @@ static option_t chap_option_list[] = {
       "specify CHAP challenge" },
     { "mschap2-peer-challenge", o_string, &mschap2_peer_challenge,
       "specify CHAP peer challenge" },
+#endif
 #endif
     { NULL }
 };
@@ -808,7 +810,9 @@ ChapReceiveFailure(cstate, inp, id, len)
     u_char id;
     int len;
 {
+#ifdef CHAPMS
     u_char *msg;
+#endif
     u_char *p = inp;
 
     if (cstate->clientstate != CHAPCS_RESPONSE) {
@@ -896,7 +900,9 @@ ChapReceiveFailure(cstate, inp, id, len)
     /*
      * Print message.
      */
+#ifdef CHAPMS
 print_msg:
+#endif
     if (len > 0 && p != NULL)
        PRINTMSG(p, len);
 
@@ -953,7 +959,7 @@ ChapSendStatus(cstate, code)
     int code;
 {
     u_char *outp;
-    int i, outlen, msglen;
+    int outlen, msglen;
     char msg[256];
     char *p, *q;
 
@@ -1021,6 +1027,8 @@ ChapSendStatus(cstate, code)
             * Basically, this whole bit is useless code, even the small
             * implementation here is only because of overspecification.
             */
+           int i;
+
            slprintf(p, q - p, "E=691 R=1 C=");
            p += 12;
            for (i = 0; i < cstate->chal_len; i++)
@@ -1033,7 +1041,9 @@ ChapSendStatus(cstate, code)
 
        slprintf(p, q - p, "I don't like you.  Go 'way.");
     }
+#ifdef CHAPMS
 msgdone:
+#endif
     msglen = strlen(msg);
 
     outlen = CHAP_HEADERLEN + msglen;