diff options
| author | Roy Marples <roy@marples.name> | 2008-11-17 17:25:54 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-11-17 17:25:54 +0000 |
| commit | c989b02361577d2227094cd396c760c1df39e697 (patch) | |
| tree | 26f80acaa0af8a0b830dc9983a69681276faf0bf /if-options.c | |
| parent | 228181a8118f4faed4f67ead567bcf2e8696cf42 (diff) | |
| download | dhcpcd-c989b02361577d2227094cd396c760c1df39e697.tar.xz | |
We no longer send a ClientID by default. This is so we now mirror the kernel DHCP client and can re-use its lease by default. To retain the old behaviour, simply add clientid to dhcpcd.conf.
Diffstat (limited to 'if-options.c')
| -rw-r--r-- | if-options.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/if-options.c b/if-options.c index 24bf5ad3..6d031295 100644 --- a/if-options.c +++ b/if-options.c @@ -467,7 +467,7 @@ parse_option(struct if_options *ifo, int opt, const char *arg) free(p); break; case 'D': - ifo->options |= DHCPCD_DUID; + ifo->options |= DHCPCD_CLIENTID | DHCPCD_DUID; break; case 'E': ifo->options |= DHCPCD_LASTLEASE; @@ -505,11 +505,8 @@ parse_option(struct if_options *ifo, int opt, const char *arg) syslog(LOG_ERR, "clientid: %m"); return -1; } + ifo->options |= DHCPCD_CLIENTID; ifo->clientid[0] = (uint8_t)s; - if (s == 0) { - ifo->options &= ~DHCPCD_DUID; - ifo->options &= ~DHCPCD_CLIENTID; - } break; case 'K': ifo->options &= ~DHCPCD_LINK; @@ -591,7 +588,7 @@ read_config(const char *file, const char *ifname) /* Seed our default options */ ifo = xzalloc(sizeof(*ifo)); - ifo->options |= DHCPCD_CLIENTID | DHCPCD_GATEWAY | DHCPCD_DAEMONISE; + ifo->options |= DHCPCD_GATEWAY | DHCPCD_DAEMONISE; ifo->options |= DHCPCD_ARP | DHCPCD_IPV4LL | DHCPCD_LINK; ifo->timeout = DEFAULT_TIMEOUT; ifo->reboot = DEFAULT_REBOOT; |