diff options
| author |   krw <krw@openbsd.org> | 2012-11-02 17:29:37 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2012-11-02 17:29:37 +0000 |
| commit | 8281923594fcb061d7d5b84a11eaefb155f0e6fd (patch) | |
| tree | 584883a98fa3724817a1c0ac1aa4a79eeb0627a6 | |
| parent | replace "err(1, (char *)NULL);" with "err(1, NULL);" (diff) | |
| download | wireguard-openbsd-8281923594fcb061d7d5b84a11eaefb155f0e6fd.tar.xz wireguard-openbsd-8281923594fcb061d7d5b84a11eaefb155f0e6fd.zip | |
Don't add a 'nameserver' line to resolv.conf if the nameserver in
question is the empty string.
Spotted by Joerg Zinke.
| -rw-r--r-- | sbin/dhclient/dhclient.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 56a785b552f..6a0e2d349ba 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dhclient.c,v 1.162 2012/10/31 20:13:33 krw Exp $ */ +/* $OpenBSD: dhclient.c,v 1.163 2012/11/02 17:29:37 krw Exp $ */ /* * Copyright 2004 Henning Brauer <henning@openbsd.org> @@ -1804,6 +1804,8 @@ new_resolv_conf(char *ifname, char *domainname, char *nameservers) for (p = strsep(&nameservers, " "); p != NULL; p = strsep(&nameservers, " ")) { + if (*p == '\0') + continue; strlcat(contents, "nameserver ", MAXRESOLVCONFSIZE); strlcat(contents, p, MAXRESOLVCONFSIZE); strlcat(contents, "\n", MAXRESOLVCONFSIZE); |