Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/utils/sysinst fix non-inet6 compilation
details: https://anonhg.NetBSD.org/src/rev/22e59a84305f
branches: trunk
changeset: 480132:22e59a84305f
user: itojun <itojun%NetBSD.org@localhost>
date: Wed Jan 05 01:50:45 2000 +0000
description:
fix non-inet6 compilation
diffstat:
distrib/utils/sysinst/menus.mi.en | 62 ++++++++++++++++++++++++++++++--------
distrib/utils/sysinst/menus.mi.fr | 62 ++++++++++++++++++++++++++++++--------
distrib/utils/sysinst/net.c | 6 ++-
3 files changed, 102 insertions(+), 28 deletions(-)
diffs (204 lines):
diff -r ab8127ea4e44 -r 22e59a84305f distrib/utils/sysinst/menus.mi.en
--- a/distrib/utils/sysinst/menus.mi.en Wed Jan 05 00:27:25 2000 +0000
+++ b/distrib/utils/sysinst/menus.mi.en Wed Jan 05 01:50:45 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.mi.en,v 1.37 2000/01/04 08:33:52 itojun Exp $ */
+/* $NetBSD: menus.mi.en,v 1.38 2000/01/05 01:50:45 itojun Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -325,29 +325,65 @@
menu namesrv6, title " Select IPv6 DNS server";
option "paradise.v6.kame.net", exit, action
- { strncpy(net_namesvr6, "3ffe:501:4819::42",
+ {
+#ifdef INET6
+ strncpy(net_namesvr6, "3ffe:501:4819::42",
sizeof(net_namesvr6));
- yesno = 1; };
+ yesno = 1;
+#else
+ yesno = 0;
+#endif
+ };
option "kiwi.itojun.org", exit, action
- { strncpy(net_namesvr6, "3ffe:501:410:100:5254:ff:feda:48bf",
+ {
+#ifdef INET6
+ strncpy(net_namesvr6, "3ffe:501:410:100:5254:ff:feda:48bf",
sizeof(net_namesvr6));
- yesno = 1; };
+ yesno = 1;
+#else
+ yesno = 0;
+#endif
+ };
option "sh1.iijlab.net", exit, action
- { strncpy(net_namesvr6, "3ffe:507:0:1:260:97ff:fe07:69ea",
+ {
+#ifdef INET6
+ strncpy(net_namesvr6, "3ffe:507:0:1:260:97ff:fe07:69ea",
sizeof(net_namesvr6));
- yesno = 1; };
+ yesno = 1;
+#else
+ yesno = 0;
+#endif
+ };
option "ns1.v6.intec.co.jp", exit, action
- { strncpy(net_namesvr6, "3ffe:508:0:1::53",
+ {
+#ifdef INET6
+ strncpy(net_namesvr6, "3ffe:508:0:1::53",
sizeof(net_namesvr6));
- yesno = 1; };
+ yesno = 1;
+#else
+ yesno = 0;
+#endif
+ };
option "nttv6.net", exit, action
- { strncpy(net_namesvr6, "3ffe:1800:1000::1",
+ {
+#ifdef INET6
+ strncpy(net_namesvr6, "3ffe:1800:1000::1",
sizeof(net_namesvr6));
- yesno = 1; };
+ yesno = 1;
+#else
+ yesno = 0;
+#endif
+ };
option "light.imasy.or.jp", exit, action
- { strncpy(net_namesvr6, "3ffe:505:0:1:2a0:c9ff:fe61:6521",
+ {
+#ifdef INET6
+ strncpy(net_namesvr6, "3ffe:505:0:1:2a0:c9ff:fe61:6521",
sizeof(net_namesvr6));
- yesno = 1; };
+ yesno = 1;
+#else
+ yesno = 0;
+#endif
+ };
option "other ", exit, action
{ yesno = 0; };
diff -r ab8127ea4e44 -r 22e59a84305f distrib/utils/sysinst/menus.mi.fr
--- a/distrib/utils/sysinst/menus.mi.fr Wed Jan 05 00:27:25 2000 +0000
+++ b/distrib/utils/sysinst/menus.mi.fr Wed Jan 05 01:50:45 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: menus.mi.fr,v 1.24 2000/01/04 08:33:52 itojun Exp $ */
+/* $NetBSD: menus.mi.fr,v 1.25 2000/01/05 01:50:45 itojun Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -325,29 +325,65 @@
menu namesrv6, title " Select IPv6 DNS server";
option "paradise.v6.kame.net", exit, action
- { strncpy(net_namesvr6, "3ffe:501:4819::42",
+ {
+#ifdef INET6
+ strncpy(net_namesvr6, "3ffe:501:4819::42",
sizeof(net_namesvr6));
- yesno = 1; };
+ yesno = 1;
+#else
+ yesno = 0;
+#endif
+ };
option "kiwi.itojun.org", exit, action
- { strncpy(net_namesvr6, "3ffe:501:410:100:5254:ff:feda:48bf",
+ {
+#ifdef INET6
+ strncpy(net_namesvr6, "3ffe:501:410:100:5254:ff:feda:48bf",
sizeof(net_namesvr6));
- yesno = 1; };
+ yesno = 1;
+#else
+ yesno = 0;
+#endif
+ };
option "sh1.iijlab.net", exit, action
- { strncpy(net_namesvr6, "3ffe:507:0:1:260:97ff:fe07:69ea",
+ {
+#ifdef INET6
+ strncpy(net_namesvr6, "3ffe:507:0:1:260:97ff:fe07:69ea",
sizeof(net_namesvr6));
- yesno = 1; };
+ yesno = 1;
+#else
+ yesno = 0;
+#endif
+ };
option "ns1.v6.intec.co.jp", exit, action
- { strncpy(net_namesvr6, "3ffe:508:0:1::53",
+ {
+#ifdef INET6
+ strncpy(net_namesvr6, "3ffe:508:0:1::53",
sizeof(net_namesvr6));
- yesno = 1; };
+ yesno = 1;
+#else
+ yesno = 0;
+#endif
+ };
option "nttv6.net", exit, action
- { strncpy(net_namesvr6, "3ffe:1800:1000::1",
+ {
+#ifdef INET6
+ strncpy(net_namesvr6, "3ffe:1800:1000::1",
sizeof(net_namesvr6));
- yesno = 1; };
+ yesno = 1;
+#else
+ yesno = 0;
+#endif
+ };
option "light.imasy.or.jp", exit, action
- { strncpy(net_namesvr6, "3ffe:505:0:1:2a0:c9ff:fe61:6521",
+ {
+#ifdef INET6
+ strncpy(net_namesvr6, "3ffe:505:0:1:2a0:c9ff:fe61:6521",
sizeof(net_namesvr6));
- yesno = 1; };
+ yesno = 1;
+#else
+ yesno = 0;
+#endif
+ };
option "other ", exit, action
{ yesno = 0; };
diff -r ab8127ea4e44 -r 22e59a84305f distrib/utils/sysinst/net.c
--- a/distrib/utils/sysinst/net.c Wed Jan 05 00:27:25 2000 +0000
+++ b/distrib/utils/sysinst/net.c Wed Jan 05 01:50:45 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.56 2000/01/04 08:33:52 itojun Exp $ */
+/* $NetBSD: net.c,v 1.57 2000/01/05 01:50:45 itojun Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -71,9 +71,11 @@
static void write_etc_hosts(FILE *f);
+#ifdef INET6
static int is_v6kernel __P((void));
static void init_v6kernel __P((int));
static int get_v6wait __P((void));
+#endif
/*
* URL encode unsafe characters. See RFC 1738.
@@ -470,7 +472,7 @@
*net_namesvr6 == '\0' ? "<none>" : net_namesvr6
#else
"<not supported>",
- "<not supported>",
+ "<not supported>"
#endif
);
process_menu(MENU_yesno);
Home |
Main Index |
Thread Index |
Old Index