diff options
| author | Chris Fraire <cfraire@me.com> | 2016-11-18 11:29:24 -0700 |
|---|---|---|
| committer | Gordon Ross <gwr@nexenta.com> | 2017-09-12 05:42:21 -0700 |
| commit | b31320a79e2054c6739b5229259dbf98f3afc547 (patch) | |
| tree | 8f7d0091db2c1e1d5df8bb8cebf12b81e124e937 /usr/src/cmd/cmd-inet/sbin/dhcpagent/request.c | |
| parent | dc97a43d4a70c8773a619f11b95b07a787f6f5b7 (diff) | |
| download | illumos-gate-b31320a79e2054c6739b5229259dbf98f3afc547.tar.gz | |
7388 Support -h <hostname> for ipadm DHCP
8517 Add ipadm and nwam options to allow designating a DHCP address as the primary interface
8518 Allow using system-generated IAID/DUID for all DHCPv4
8519 Add ns_name_pton2 to libresolv2 mapfile
Reviewed by: Dan McDonald <danmcd@joyent.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Peter Tribble <peter.tribble@gmail.com>
Approved by: Gordon Ross <gwr@nexenta.com>
Diffstat (limited to 'usr/src/cmd/cmd-inet/sbin/dhcpagent/request.c')
| -rw-r--r-- | usr/src/cmd/cmd-inet/sbin/dhcpagent/request.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr/src/cmd/cmd-inet/sbin/dhcpagent/request.c b/usr/src/cmd/cmd-inet/sbin/dhcpagent/request.c index 78da07aebf..6b5a08a51a 100644 --- a/usr/src/cmd/cmd-inet/sbin/dhcpagent/request.c +++ b/usr/src/cmd/cmd-inet/sbin/dhcpagent/request.c @@ -21,6 +21,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. + * Copyright (c) 2016-2017, Chris Fraire <cfraire@me.com>. * * REQUESTING state of the client state machine. */ @@ -245,6 +246,8 @@ dhcp_requesting(iu_tq_t *tqp, void *arg) return; } + save_domainname(dsmp, offer); + if (isv6) { const char *estr, *msg; const dhcpv6_option_t *d6o; @@ -313,7 +316,8 @@ dhcp_requesting(iu_tq_t *tqp, void *arg) * dhcp_selecting() if the DF_REQUEST_HOSTNAME option set and a * host name was found */ - if (dsmp->dsm_reqhost != NULL) { + if (!dhcp_add_fqdn_opt(dpkt, dsmp) && + dsmp->dsm_reqhost != NULL) { (void) add_pkt_opt(dpkt, CD_HOSTNAME, dsmp->dsm_reqhost, strlen(dsmp->dsm_reqhost)); } |