Fixup in merge/rebase, had to remove duplicate use of pppdconf.h

Signed-off-by: Eivind Næss <eivnaes@yahoo.com>

diff --git a/pppd/Makefile.am b/pppd/Makefile.am
index 233685350463036cf664eae7977eb5f312de6b37..c316ea44d4b03c62c4891b986a6923a2b37e0f53 100644 (file)
--- a/pppd/Makefile.am
+++ b/pppd/Makefile.am
@@ -37,7 +37,6 @@ pppd_include_HEADERS = \
     md4.h \
     md5.h \
     mppe.h \
-    pppdconf.h \
     pathnames.h \
     peap.h \
     pppcrypt.h \

diff --git a/pppd/plugins/passprompt.c b/pppd/plugins/passprompt.c
index 35398a9169d7208629610ad4595c3186ba889149..14a199f8c743e574a71538d996998fd0361fcafe 100644 (file)
--- a/pppd/plugins/passprompt.c
+++ b/pppd/plugins/passprompt.c
@@ -13,6 +13,7 @@
 #include <unistd.h>
 #include <sys/wait.h>
 #include <sys/param.h>
+#include <limits.h>
 #include <syslog.h>
 #include <pppd/pppd.h>