From: Roy Marples <roy@marples.name>
Date: Wed, 6 Aug 2008 08:31:20 +0000 (+0000)
Subject: Allow disable for fqdn option so command line can override config.
X-Git-Tag: v4.0.2~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14b5ef555cd44f42aeb1364a32f17384c525f792;p=thirdparty%2Fdhcpcd.git

Allow disable for fqdn option so command line can override config.
---

diff --git a/dhcpcd.8.in b/dhcpcd.8.in
index 7a3dcf1e..d17e8e62 100644
--- a/dhcpcd.8.in
+++ b/dhcpcd.8.in
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd Jul 28, 2008
+.Dd August 6, 2008
 .Dt DHCPCD 8 SMM
 .Sh NAME
 .Nm dhcpcd
@@ -296,7 +296,7 @@ Requests that the DHCP server updates DNS using FQDN instead of just a
 hostname.
 Valid values for
 .Ar fqdn
-are none, ptr and both.
+are disable, none, ptr and both.
 The current hostname or the hostname specified using the
 .Fl h , -hostname
 option must be a FQDN.
diff --git a/dhcpcd.c b/dhcpcd.c
index db7e9087..75fc3a40 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -501,6 +501,8 @@ parse_option(int opt, char *oarg, struct options *options)
 			options->fqdn = FQDN_PTR;
 		else if (strcmp(oarg, "both") == 0)
 			options->fqdn = FQDN_BOTH;
+		else if (strcmp(oarg, "disable") == 0)
+			options->fqdn = FQDN_DISABLE;
 		else {
 			logger(LOG_ERR, "invalid value `%s' for FQDN",
 			       oarg);