summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2004-03-02 12:46:45 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2004-03-02 12:46:45 +0000
commit1e2f9f75f8131bfba8403f7d557dd4273ea61601 (patch)
treed408316ad5715b035583953f56f09306765efff0
parent3d6d923973022ed0a27aedab9f4be6a9a5f217ed (diff)
our interface discovery is so quiet now (nonexistant) that we don't need a
quiet_interface_discovery flag any more
-rw-r--r--sbin/dhclient/dhclient.c3
-rw-r--r--sbin/dhclient/dhcpd.h3
-rw-r--r--sbin/dhclient/dispatch.c4
3 files changed, 3 insertions, 7 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index 8f683232e98..83bbbe10443 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhclient.c,v 1.21 2004/03/02 12:40:31 henning Exp $ */
+/* $OpenBSD: dhclient.c,v 1.22 2004/03/02 12:46:44 henning Exp $ */
/* DHCP Client. */
@@ -236,7 +236,6 @@ main(int argc, char *argv[])
break;
case 'q':
quiet = 1;
- quiet_interface_discovery = 1;
break;
case 'u':
unknown_ok = 0;
diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h
index 4ac24a73852..964751ab300 100644
--- a/sbin/dhclient/dhcpd.h
+++ b/sbin/dhclient/dhcpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhcpd.h,v 1.20 2004/03/02 12:40:31 henning Exp $ */
+/* $OpenBSD: dhcpd.h,v 1.21 2004/03/02 12:46:44 henning Exp $ */
/*
* Copyright (c) 2004 Henning Brauer <henning@openbsd.org>
@@ -322,7 +322,6 @@ ssize_t receive_packet(struct interface_info *, unsigned char *, size_t,
extern struct interface_info *interfaces,
*dummy_interfaces, *fallback_interface;
extern struct protocol *protocols;
-extern int quiet_interface_discovery;
extern void (*bootp_packet_handler)(struct interface_info *,
struct dhcp_packet *, int, unsigned int, struct iaddr, struct hardware *);
extern struct timeout *timeouts;
diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c
index c342f61eb3a..04146b81bc8 100644
--- a/sbin/dhclient/dispatch.c
+++ b/sbin/dhclient/dispatch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dispatch.c,v 1.18 2004/03/02 12:43:09 henning Exp $ */
+/* $OpenBSD: dispatch.c,v 1.19 2004/03/02 12:46:44 henning Exp $ */
/*
* Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -58,8 +58,6 @@ void (*bootp_packet_handler)(struct interface_info *,
static int interface_status(struct interface_info *ifinfo);
-int quiet_interface_discovery;
-
/*
* Use getifaddrs() to get a list of all the attached interfaces. For
* each interface that's of type INET and not the loopback interface,