46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
--- pppd/auth.c.orig
|
|
+++ pppd/auth.c
|
|
@@ -2105,9 +2105,10 @@ check_access(f, filename)
|
|
|
|
if (fstat(fileno(f), &sbuf) < 0) {
|
|
warn("cannot stat secret file %s: %m", filename);
|
|
- } else if ((sbuf.st_mode & (S_IRWXG | S_IRWXO)) != 0) {
|
|
- warn("Warning - secret file %s has world and/or group access",
|
|
- filename);
|
|
+ } else if ((sbuf.st_mode & S_IRWXO) != 0) {
|
|
+ warn("Warning - secret file %s has world access", filename);
|
|
+ } else if ((sbuf.st_mode & S_IRWXG) != 0 && sbuf.st_gid != 15) {
|
|
+ warn("Warning - secret file %s has group access", filename);
|
|
}
|
|
}
|
|
|
|
--- pppd/lcp.c.orig
|
|
+++ pppd/lcp.c
|
|
@@ -2302,7 +2302,7 @@ lcp_received_echo_reply (f, id, inp, len
|
|
if (lcp_gotoptions[f->unit].neg_magicnumber
|
|
&& magic == lcp_gotoptions[f->unit].magicnumber) {
|
|
warn("appear to have received our own echo-reply!");
|
|
- return;
|
|
+ /* M$-Software did get this wrong so we also accept those packets. */
|
|
}
|
|
|
|
/* Reset the number of outstanding echo frames */
|
|
--- pppd/pppd.h.orig
|
|
+++ pppd/pppd.h
|
|
@@ -873,15 +873,7 @@ extern void (*snoop_send_hook) __P((unsi
|
|
#define DEBUGCHAP 1
|
|
#endif
|
|
|
|
-#ifndef LOG_PPP /* we use LOG_LOCAL2 for syslog by default */
|
|
-#if defined(DEBUGMAIN) || defined(DEBUGFSM) || defined(DEBUGSYS) \
|
|
- || defined(DEBUGLCP) || defined(DEBUGIPCP) || defined(DEBUGUPAP) \
|
|
- || defined(DEBUGCHAP) || defined(DEBUG) || defined(DEBUGIPV6CP)
|
|
#define LOG_PPP LOG_LOCAL2
|
|
-#else
|
|
-#define LOG_PPP LOG_DAEMON
|
|
-#endif
|
|
-#endif /* LOG_PPP */
|
|
|
|
#ifdef DEBUGMAIN
|
|
#define MAINDEBUG(x) if (debug) dbglog x
|