File ppp-2.4.6-misc.diff of Package ppp

Overview Repositories Revisions Requests Users Attributes Meta

File ppp-2.4.6-misc.diff of Package ppp (Revision 5a84481585cbc7643ebea270ad1b7d4b)

Currently displaying revision 5a84481585cbc7643ebea270ad1b7d4b , Show latest

--- pppd/auth.c
+++ pppd/auth.c
@@ -2091,9 +2091,10 @@
 
     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
+++ pppd/lcp.c
@@ -2303,7 +2303,7 @@
     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
+++ pppd/pppd.h
@@ -848,15 +848,7 @@
 #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

Places

File ppp-2.4.6-misc.diff of Package ppp (Revision 5a84481585cbc7643ebea270ad1b7d4b)

Places