ppp: refresh patches
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
#ifdef CHAPMS
|
||||
#include "chap_ms.h"
|
||||
#define MDTYPE_ALL (MDTYPE_MICROSOFT_V2 | MDTYPE_MICROSOFT | MDTYPE_MD5)
|
||||
@@ -481,6 +483,18 @@ chap_respond(struct chap_client_state *cs, int id,
|
||||
@@ -523,6 +525,18 @@ chap_respond(struct chap_client_state *cs, int id,
|
||||
p[2] = len >> 8;
|
||||
p[3] = len;
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
--- a/pppd/Makefile.linux
|
||||
+++ b/pppd/Makefile.linux
|
||||
@@ -13,16 +13,16 @@ TARGETS = pppd
|
||||
@@ -17,16 +17,16 @@ TARGETS = pppd
|
||||
|
||||
PPPDSRCS = main.c magic.c fsm.c lcp.c ipcp.c upap.c chap-new.c md5.c ccp.c \
|
||||
ecp.c ipxcp.c auth.c options.c sys-linux.c md4.c chap_ms.c \
|
||||
@@ -50,10 +50,10 @@
|
||||
|
||||
#
|
||||
# include dependencies if present
|
||||
@@ -33,7 +33,7 @@ endif
|
||||
# CC = gcc
|
||||
#
|
||||
COPTS = -O2 -pipe -Wall -g
|
||||
@@ -34,7 +34,7 @@ ifeq (.depend,$(wildcard .depend))
|
||||
include .depend
|
||||
endif
|
||||
|
||||
-LIBS = -lrt
|
||||
+LIBS = -lpthread
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
# MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux.
|
||||
--- a/pppd/options.c
|
||||
+++ b/pppd/options.c
|
||||
@@ -123,6 +123,7 @@ bool dump_options; /* print out option values */
|
||||
@@ -127,6 +127,7 @@ bool dump_options; /* print out option values */
|
||||
bool dryrun; /* print out option values and exit */
|
||||
char *domain; /* domain name set by domain option */
|
||||
int child_wait = 5; /* # seconds to wait for children at exit */
|
||||
@@ -69,7 +69,7 @@
|
||||
struct userenv *userenv_list; /* user environment variables */
|
||||
int dfl_route_metric = -1; /* metric of the default route to set over the PPP link */
|
||||
|
||||
@@ -312,6 +313,9 @@ option_t general_options[] = {
|
||||
@@ -323,6 +324,9 @@ option_t general_options[] = {
|
||||
"Unset user environment variable",
|
||||
OPT_A2PRINTER | OPT_NOPRINT, (void *)user_unsetprint },
|
||||
|
||||
@@ -81,14 +81,14 @@
|
||||
OPT_PRIV|OPT_LLIMIT|OPT_INITONLY, NULL, 0, -1 },
|
||||
--- a/pppd/pppd.h
|
||||
+++ b/pppd/pppd.h
|
||||
@@ -341,6 +341,7 @@ extern char *bundle_name; /* bundle name for multilink */
|
||||
@@ -335,6 +335,7 @@ extern char *bundle_name; /* bundle name for multilink */
|
||||
extern bool dump_options; /* print out option values */
|
||||
extern bool dryrun; /* check everything, print options, exit */
|
||||
extern int child_wait; /* # seconds to wait for children at end */
|
||||
+extern int npppd; /* synchronize between multiple pppd */
|
||||
|
||||
#ifdef MAXOCTETS
|
||||
extern unsigned int maxoctets; /* Maximum octetes per session (in bytes) */
|
||||
#ifdef USE_EAPTLS
|
||||
extern char *crl_dir;
|
||||
--- /dev/null
|
||||
+++ b/pppd/syncppp.c
|
||||
@@ -0,0 +1,75 @@
|
||||
@@ -175,7 +175,7 @@
|
||||
+#define SYNCPPP_TIMEOUT 5
|
||||
--- a/pppd/upap.c
|
||||
+++ b/pppd/upap.c
|
||||
@@ -52,6 +52,7 @@
|
||||
@@ -50,6 +50,7 @@
|
||||
#include "pppd.h"
|
||||
#include "upap.h"
|
||||
|
||||
@@ -183,7 +183,7 @@
|
||||
|
||||
static bool hide_password = 1;
|
||||
|
||||
@@ -567,6 +568,18 @@ upap_sauthreq(u)
|
||||
@@ -540,6 +541,18 @@ upap_sauthreq(upap_state *u)
|
||||
PUTCHAR(u->us_passwdlen, outp);
|
||||
BCOPY(u->us_passwd, outp, u->us_passwdlen);
|
||||
|
||||
@@ -17,7 +17,7 @@ This reverts commit 3c7b86229f7bd2600d74db14b1fe5b3896be3875.
|
||||
+++ b/pppd/Makefile.linux
|
||||
@@ -36,10 +36,10 @@ endif
|
||||
|
||||
LIBS = -lrt
|
||||
LIBS = -lpthread
|
||||
|
||||
-# Uncomment the next line to include support for Microsoft's
|
||||
+# Uncomment the next 2 lines to include support for Microsoft's
|
||||
|
||||
Reference in New Issue
Block a user