diff --git a/config/Kconfig b/config/Kconfig deleted file mode 100644 index b7a19fe74..000000000 --- a/config/Kconfig +++ /dev/null @@ -1,15 +0,0 @@ -############################################################################# - -# -# Kconfig - user space configuration -# - -############################################################################# - -mainmenu "Linux Application Configuration" - -source ../lib/Kconfig - -source ../user/Kconfig - -############################################################################# diff --git a/user/pppd/pppd/eap.c b/user/pppd/pppd/eap.c index 6203f94d0..48547e6be 100644 --- a/user/pppd/pppd/eap.c +++ b/user/pppd/pppd/eap.c @@ -1421,7 +1421,7 @@ int len; } /* Not so likely to happen. */ - if (vallen >= len + sizeof (rhostname)) { + if (len - vallen >= sizeof (rhostname)) { dbglog("EAP: trimming really long peer name down"); BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); rhostname[sizeof (rhostname) - 1] = '\0'; @@ -1847,7 +1847,7 @@ int len; } /* Not so likely to happen. */ - if (vallen >= len + sizeof (rhostname)) { + if (len - vallen >= sizeof (rhostname)) { dbglog("EAP: trimming really long peer name down"); BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1); rhostname[sizeof (rhostname) - 1] = '\0';