diff options
author | obrien <obrien@FreeBSD.org> | 2000-08-09 18:38:26 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2000-08-09 18:38:26 +0000 |
commit | 6a1679ea16dbd0b33947cd4eced9d441ea9ccc30 (patch) | |
tree | 1f5441511e1d8cbde2de961ddd6e2d3bcb206e7e | |
parent | 8fb22bea284891455a2cca346eb342f034672eb4 (diff) | |
download | FreeBSD-src-6a1679ea16dbd0b33947cd4eced9d441ea9ccc30.zip FreeBSD-src-6a1679ea16dbd0b33947cd4eced9d441ea9ccc30.tar.gz |
Fix conflicts.
-rw-r--r-- | contrib/isc-dhcp/client/dhclient.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/isc-dhcp/client/dhclient.c b/contrib/isc-dhcp/client/dhclient.c index 01e87b2..dd66b50 100644 --- a/contrib/isc-dhcp/client/dhclient.c +++ b/contrib/isc-dhcp/client/dhclient.c @@ -1972,7 +1972,7 @@ void script_write_params (ip, prefix, lease) if (broadcast.len) { client_envadd (ip -> client, prefix, "broadcast_address", - "%s", piaddr (subnet)); + "%s", piaddr (broadcast)); } } } |