X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fchap-new.c;h=565713f2cfa7bf2ed060c1211260673a46a29e60;hb=bdd34ab1f2f87acb23c6d92feee7354ac53005ff;hp=2e74fb86151ce99460c1ce7ca12b9b6e44075e87;hpb=a72f809b1dfe0857290a85b2af52279a05fe2f94;p=ppp.git

diff --git a/pppd/chap-new.c b/pppd/chap-new.c
index 2e74fb8..565713f 100644
--- 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
@@ -59,6 +63,7 @@ int chap_server_timeout_time = 3;
 int chap_max_transmits = 10;
 int chap_rechallenge_time = 0;
 int chap_client_timeout_time = 60;
+int chapms_strip_domain = 0;
 
 /*
  * Command-line options.
@@ -72,6 +77,8 @@ static option_t chap_option_list[] = {
 	  "Set interval for rechallenge", OPT_PRIO },
 	{ "chap-timeout", o_int, &chap_client_timeout_time,
 	  "Set timeout for CHAP (as client)", OPT_PRIO },
+	{ "chapms-strip-domain", o_bool, &chapms_strip_domain,
+	  "Strip the domain prefix before the Username", 1 },
 	{ NULL }
 };
 
@@ -133,7 +140,7 @@ static void chap_handle_status(struct chap_client_state *cs, int code, int id,
 static void chap_protrej(int unit);
 static void chap_input(int unit, unsigned char *pkt, int pktlen);
 static int chap_print_pkt(unsigned char *p, int plen,
-		void (*printer) __P((void *, char *, ...)), void *arg);
+		void (*printer)(void *, char *, ...), void *arg);
 
 /* List of digest types that we know about */
 static struct chap_digest_type *chap_digests;
@@ -148,7 +155,7 @@ chap_init(int unit)
 	memset(&server, 0, sizeof(server));
 
 	chap_md5_init();
-#ifdef CHAPMS
+#ifdef PPP_WITH_CHAPMS
 	chapms_init();
 #endif
 }
@@ -163,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.
  */
@@ -207,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);
@@ -355,6 +373,14 @@ chap_handle_response(struct chap_server_state *ss, int id,
 			/* Null terminate and clean remote name. */
 			slprintf(rname, sizeof(rname), "%.*v", len, name);
 			name = rname;
+
+			/* strip the MS domain name */
+			if (chapms_strip_domain && strrchr(rname, '\\')) {
+				char tmp[MAXNAMELEN+1];
+
+				strcpy(tmp, strrchr(rname, '\\') + 1);
+				strcpy(rname, tmp);
+			}
 		}
 
 		if (chap_verify_hook)
@@ -606,7 +632,7 @@ static char *chap_code_names[] = {
 
 static int
 chap_print_pkt(unsigned char *p, int plen,
-	       void (*printer) __P((void *, char *, ...)), void *arg)
+	       void (*printer)(void *, char *, ...), void *arg)
 {
 	int code, id, len;
 	int clen, nlen;