pppd: Enable IPV6 by default and fix some warnings

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 <paulus@samba.org>

diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
index 060db6a25113208ba6b4107d6a7590f974897fbd..fd71454517e7ec7be2a29aa7fb3b3cdcddb9d25c 100644 (file)
--- 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 4421d99bd920f9477904d49e8e8dbabecdf7b9b8..caa2b265d7e7b20f3b3bb1a093d88d26fb1cdcda 100644 (file)
--- a/pppd/ipv6cp.c
+++ b/pppd/ipv6cp.c
@@ -151,6 +151,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <netdb.h>
@@ -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 2cd79146e56f1c4cbfd56aa0db22c371893505d8..1f208894f77bf38a9e7ad20bfb64c919271ae767 100644 (file)
--- 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));