diff options
| author | Kevin Steves <stevesk@cvs.openbsd.org> | 2006-12-18 18:08:13 +0000 |
|---|---|---|
| committer | Kevin Steves <stevesk@cvs.openbsd.org> | 2006-12-18 18:08:13 +0000 |
| commit | 7816dd5420a1c3ca7fe07c6ff7a9e3ca26c06f7d (patch) | |
| tree | 08e7be5193680ac8045544dab5bb35a393a825e2 | |
| parent | 169d27fb3cf06ca74da2e9bf441b981bd2b1e1b9 (diff) | |
this is clearer and consistent with other areas; ok henning@
| -rw-r--r-- | sbin/dhclient/dhclient.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 5ffd79de371..53f38a8b74d 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.92 2006/12/17 18:09:32 stevesk Exp $ */ +/* $OpenBSD: dhclient.c,v 1.93 2006/12/18 18:08:12 stevesk Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -1488,6 +1488,7 @@ make_request(struct interface_info *ip, struct client_lease * lease) ip->client->packet.hops = 0; ip->client->packet.xid = ip->client->xid; ip->client->packet.secs = 0; /* Filled in by send_request. */ + ip->client->packet.flags = 0; /* If we own the address we're requesting, put it in ciaddr; otherwise set ciaddr to zero. */ @@ -1496,11 +1497,9 @@ make_request(struct interface_info *ip, struct client_lease * lease) ip->client->state == S_REBINDING) { memcpy(&ip->client->packet.ciaddr, lease->address.iabuf, lease->address.len); - ip->client->packet.flags = 0; } else { memset(&ip->client->packet.ciaddr, 0, sizeof(ip->client->packet.ciaddr)); - ip->client->packet.flags = 0; } memset(&ip->client->packet.yiaddr, 0, |