4c4da37c09
Bump to the current version of PPP. A few of the patches are either in 2.4.5 or something functionally equivalent is, so those patches were removed. 1 patch was added to accommodate pppol2pv3_addr which is referenced in a linux kernel header file, but isn't defined in the kernel header files packaged with PPP. Redux: re-instate the commenting out of the exponential back-off as requested by Felix. Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com> SVN-Revision: 27818
35 lines
1003 B
Diff
35 lines
1003 B
Diff
--- a/pppd/chap-new.c
|
|
+++ b/pppd/chap-new.c
|
|
@@ -58,6 +58,7 @@ int (*chap_verify_hook)(char *name, char
|
|
int chap_timeout_time = 3;
|
|
int chap_max_transmits = 10;
|
|
int chap_rechallenge_time = 0;
|
|
+int chapms_strip_domain = 0;
|
|
|
|
/*
|
|
* Command-line options.
|
|
@@ -69,6 +70,8 @@ static option_t chap_option_list[] = {
|
|
"Set max #xmits for challenge", OPT_PRIO },
|
|
{ "chap-interval", o_int, &chap_rechallenge_time,
|
|
"Set interval for rechallenge", OPT_PRIO },
|
|
+ { "chapms-strip-domain", o_bool, &chapms_strip_domain,
|
|
+ "Strip the domain prefix before the Username", 1 },
|
|
{ NULL }
|
|
};
|
|
|
|
@@ -336,6 +339,14 @@ chap_handle_response(struct chap_server_
|
|
/* 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)
|