diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2009-05-21 10:48:24 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2009-05-21 10:48:24 +0000 |
| commit | ed5472e86882f5358d159df645c5ed8f3829b7e8 (patch) | |
| tree | 5a849a581e1b9494579dc7a5c380c5efd7102af5 /package/ppp/patches/106-debian_stripMSdomain.patch | |
| parent | a32b336a3bc5ab07f808f4b1c2a1dcee16e2b553 (diff) | |
| download | upstream-ed5472e86882f5358d159df645c5ed8f3829b7e8.tar.gz upstream-ed5472e86882f5358d159df645c5ed8f3829b7e8.tar.bz2 upstream-ed5472e86882f5358d159df645c5ed8f3829b7e8.zip | |
[ppp] Make patches apply agagin.
The deleted parts were two times in the patches.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15957 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/ppp/patches/106-debian_stripMSdomain.patch')
| -rw-r--r-- | package/ppp/patches/106-debian_stripMSdomain.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/package/ppp/patches/106-debian_stripMSdomain.patch b/package/ppp/patches/106-debian_stripMSdomain.patch index 5dbe254779..37c4529b54 100644 --- a/package/ppp/patches/106-debian_stripMSdomain.patch +++ b/package/ppp/patches/106-debian_stripMSdomain.patch @@ -33,38 +33,3 @@ diff -Naur ppp-2.4.4.orig/pppd/chap-new.c ppp-2.4.4/pppd/chap-new.c } if (chap_verify_hook) -diff -Naur ppp-2.4.4.orig/pppd/chap-new.c ppp-2.4.4/pppd/chap-new.c ---- ppp-2.4.4.orig/pppd/chap-new.c 2005-07-13 06:41:58.000000000 -0400 -+++ ppp-2.4.4/pppd/chap-new.c 2009-05-07 16:18:37.000000000 -0400 -@@ -57,6 +57,7 @@ - int chap_timeout_time = 3; - int chap_max_transmits = 10; - int chap_rechallenge_time = 0; -+int chapms_strip_domain = 0; - - /* - * Command-line options. -@@ -68,6 +69,8 @@ - "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 } - }; - -@@ -335,6 +338,14 @@ - /* 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) |