From 0b6118239615e98959f7e0b4e746bdd197533248 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Sun, 20 May 2012 12:01:48 +1000 Subject: [PATCH] pppd: Enable IPV6 by default and fix some warnings MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes these warnings: ipv6cp.c: In function ‘ipv6_check_options’: ipv6cp.c:1106:2: warning: implicit declaration of function ‘ether_to_eui64’ [-Wimplicit-function-declaration] ipv6cp.c:1133:2: warning: implicit declaration of function ‘exit’ [-Wimplicit-function-declaration] ipv6cp.c:1133:2: warning: incompatible implicit declaration of built-in function ‘exit’ [enabled by default] Signed-off-by: Paul Mackerras --- pppd/Makefile.linux | 2 +- pppd/ipv6cp.c | 3 ++- pppd/pppd.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux index 060db6a..fd71454 100644 --- a/pppd/Makefile.linux +++ b/pppd/Makefile.linux @@ -62,7 +62,7 @@ USE_TDB=y HAS_SHADOW=y #USE_PAM=y -#HAVE_INET6=y +HAVE_INET6=y # Enable plugins PLUGIN=y diff --git a/pppd/ipv6cp.c b/pppd/ipv6cp.c index 4421d99..caa2b26 100644 --- a/pppd/ipv6cp.c +++ b/pppd/ipv6cp.c @@ -151,6 +151,7 @@ */ #include +#include #include #include #include @@ -1130,7 +1131,7 @@ ipv6_check_options() if (demand && (eui64_iszero(wo->ourid) || eui64_iszero(wo->hisid))) { option_error("local/remote LL address required for demand-dialling\n"); - exit(1); + exit(EXIT_OPTION_ERROR); } } diff --git a/pppd/pppd.h b/pppd/pppd.h index 2cd7914..1f20889 100644 --- a/pppd/pppd.h +++ b/pppd/pppd.h @@ -655,6 +655,7 @@ int sifaddr __P((int, u_int32_t, u_int32_t, u_int32_t)); int cifaddr __P((int, u_int32_t, u_int32_t)); /* Reset i/f IP addresses */ #ifdef INET6 +int ether_to_eui64(eui64_t *p_eui64); /* convert eth0 hw address to EUI64 */ int sif6addr __P((int, eui64_t, eui64_t)); /* Configure IPv6 addresses for i/f */ int cif6addr __P((int, eui64_t, eui64_t)); -- 2.39.2