Changing USE_SRP to PPP_WITH_SRP for consistency

[ppp.git] / pppd / chap-new.c

diff --git a/pppd/chap-new.c b/pppd/chap-new.c
index fab82800a7b33950935c8b13a1be41a0982b45dd..565713f2cfa7bf2ed060c1211260673a46a29e60 100644 (file)
--- a/pppd/chap-new.c
+++ b/pppd/chap-new.c
@@ -30,6 +30,10 @@
 
 #define RCSID  "$Id: chap-new.c,v 1.9 2007/06/19 02:08:35 carlsonj Exp $"
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include "pppd.h"
@@ -37,7 +41,7 @@
 #include "chap-new.h"
 #include "chap-md5.h"
 
-#ifdef CHAPMS
+#ifdef PPP_WITH_CHAPMS
 #include "chap_ms.h"
 #define MDTYPE_ALL (MDTYPE_MICROSOFT_V2 | MDTYPE_MICROSOFT | MDTYPE_MD5)
 #else
@@ -151,7 +155,7 @@ chap_init(int unit)
        memset(&server, 0, sizeof(server));
 
        chap_md5_init();
-#ifdef CHAPMS
+#ifdef PPP_WITH_CHAPMS
        chapms_init();
 #endif
 }
@@ -166,6 +170,18 @@ chap_register_digest(struct chap_digest_type *dp)
        chap_digests = dp;
 }
 
+/*
+ * Lookup a digest type by code
+ */
+struct chap_digest_type *
+chap_find_digest(int digest_code) {
+       struct chap_digest_type *dp = NULL;
+       for (dp = chap_digests; dp != NULL; dp = dp->next)
+               if (dp->code == digest_code)
+                       break;
+       return dp;
+}
+
 /*
  * chap_lowerup - we can start doing stuff now.
  */
@@ -210,9 +226,8 @@ chap_auth_peer(int unit, char *our_name, int digest_code)
                error("CHAP: peer authentication already started!");
                return;
        }
-       for (dp = chap_digests; dp != NULL; dp = dp->next)
-               if (dp->code == digest_code)
-                       break;
+
+       dp = chap_find_digest(digest_code);
        if (dp == NULL)
                fatal("CHAP digest 0x%x requested but not available",
                      digest_code);