aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern A. Zeeb <bz@FreeBSD.org>2011-07-18 10:29:16 +0000
committerBjoern A. Zeeb <bz@FreeBSD.org>2011-07-18 10:29:16 +0000
commitad2571a225fb3ad223ec66ddba94d73eb7b717c9 (patch)
tree78daff93b0e2f102bb54157a0ae4df5dfc7ba8b2
parent1bc399c4b167d3475a10e6cb321acc1663048e51 (diff)
Notes
-rw-r--r--sbin/ifconfig/af_inet.c3
-rw-r--r--sbin/ifconfig/af_inet6.c2
-rw-r--r--sbin/ifconfig/ifconfig.c2
3 files changed, 7 insertions, 0 deletions
diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c
index 6b4d73576382..19e27c90afd7 100644
--- a/sbin/ifconfig/af_inet.c
+++ b/sbin/ifconfig/af_inet.c
@@ -200,7 +200,10 @@ static struct afswtch af_inet = {
static __constructor void
inet_ctor(void)
{
+
+#ifndef RESCUE
if (!feature_present("inet"))
return;
+#endif
af_register(&af_inet);
}
diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c
index 585be0500923..e39c1c8cfc20 100644
--- a/sbin/ifconfig/af_inet6.c
+++ b/sbin/ifconfig/af_inet6.c
@@ -545,8 +545,10 @@ inet6_ctor(void)
#define N(a) (sizeof(a) / sizeof(a[0]))
size_t i;
+#ifndef RESCUE
if (!feature_present("inet6"))
return;
+#endif
for (i = 0; i < N(inet6_cmds); i++)
cmd_register(&inet6_cmds[i]);
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 408d77eaa226..af280ce24020 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -498,10 +498,12 @@ ifconfig(int argc, char *const *argv, int iscreate, const struct afswtch *uafp)
* ifconfig IF up/down etc. to work without INET support as people
* never used ifconfig IF link up/down, etc. either.
*/
+#ifndef RESCUE
#ifdef INET
if (afp == NULL && feature_present("inet"))
afp = af_getbyname("inet");
#endif
+#endif
if (afp == NULL)
afp = af_getbyname("link");
if (afp == NULL) {