diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2004-03-02 15:41:45 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2004-03-02 15:41:45 +0000 |
| commit | 8ac3a559f4488e90d110b1b7289d81cc857fe41c (patch) | |
| tree | c837aa1b22b0c65a79776371ad9a72b9658a9c35 | |
| parent | 5f807bd978ed6ab5e042dd171625106314418daa (diff) | |
zap interface flags
| -rw-r--r-- | sbin/dhclient/clparse.c | 4 | ||||
| -rw-r--r-- | sbin/dhclient/dhclient.c | 3 | ||||
| -rw-r--r-- | sbin/dhclient/dhcpd.h | 5 |
3 files changed, 3 insertions, 9 deletions
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c index 34bbc51d23f..4bc419a2dea 100644 --- a/sbin/dhclient/clparse.c +++ b/sbin/dhclient/clparse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clparse.c,v 1.10 2004/03/02 13:39:44 henning Exp $ */ +/* $OpenBSD: clparse.c,v 1.11 2004/03/02 15:41:44 henning Exp $ */ /* Parser for dhclient config and lease files... */ @@ -399,8 +399,6 @@ parse_interface_declaration(FILE *cfile, struct client_config *outer_config) if (!ip->client->config) make_client_config(ip, outer_config); - ip->flags &= ~INTERFACE_AUTOMATIC; - token = next_token(&val, cfile); if (token != LBRACE) { parse_warn("expecting left brace."); diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index fd7869e71be..0118fcf0f85 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.26 2004/03/02 15:34:03 henning Exp $ */ +/* $OpenBSD: dhclient.c,v 1.27 2004/03/02 15:41:44 henning Exp $ */ /* DHCP Client. */ @@ -247,7 +247,6 @@ main(int argc, char *argv[]) if ((ifi = calloc(1, sizeof(struct interface_info))) == NULL) error("calloc"); strlcpy(ifi->name, argv[0], IFNAMSIZ); - ifi->flags = INTERFACE_REQUESTED; if (quiet) log_perror = 0; diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h index 79c8cbfcf2f..af2741dc003 100644 --- a/sbin/dhclient/dhcpd.h +++ b/sbin/dhclient/dhcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.h,v 1.23 2004/03/02 13:39:44 henning Exp $ */ +/* $OpenBSD: dhcpd.h,v 1.24 2004/03/02 15:41:44 henning Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@openbsd.org> @@ -202,9 +202,6 @@ struct interface_info { size_t rbuf_offset; size_t rbuf_len; struct ifreq *ifp; - u_int32_t flags; -#define INTERFACE_REQUESTED 1 -#define INTERFACE_AUTOMATIC 2 struct client_state *client; int noifmedia; int errors; |