From: Roy Marples <roy@marples.name>
Date: Mon, 25 Aug 2008 07:34:10 +0000 (+0000)
Subject: Fix CMDLINE_COMPAT.
X-Git-Tag: v4.0.2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78593b95f4866ae0d3c9f39906da3f42f0e69313;p=thirdparty%2Fdhcpcd.git

Fix CMDLINE_COMPAT.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index dc2082a7..0219b02f 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -628,12 +628,12 @@ main(int argc, char **argv)
 					     "%s %s", PACKAGE, VERSION);
 
 #ifdef CMDLINE_COMPAT
-	add_requestmask(options->requestmask, DHO_DNSSERVER);
-	add_requestmask(options->reqmask, DHO_DNSDOMAIN);
-	add_requestmask(options->reqmask, DHO_DNSSEARCH);
-	add_requestmask(options->reqmask, DHO_NISSERVER);
-	add_requestmask(options->reqmask, DHO_NISDOMAIN);
-	add_requestmask(options->reqmask, DHO_NTPSERVER);
+	add_option_mask(options->requestmask, DHO_DNSSERVER);
+	add_option_mask(options->requestmask, DHO_DNSDOMAIN);
+	add_option_mask(options->requestmask, DHO_DNSSEARCH);
+	add_option_mask(options->requestmask, DHO_NISSERVER);
+	add_option_mask(options->requestmask, DHO_NISDOMAIN);
+	add_option_mask(options->requestmask, DHO_NTPSERVER);
 
 	/* If the duid file exists, then enable duid by default
 	 * This means we don't break existing clients that easily :) */
@@ -782,22 +782,22 @@ main(int argc, char **argv)
 #ifdef CMDLINE_COMPAT
 		case 'H': /* FALLTHROUGH */
 		case 'M':
-			del_requestmask(options->reqmask, DHO_MTU);
+			del_option_mask(options->requestmask, DHO_MTU);
 			break;
 		case 'N':
-			del_requestmask(options->reqmask, DHO_NTPSERVER);
+			del_option_mask(options->requestmask, DHO_NTPSERVER);
 			break;
 		case 'R':
-			del_requestmask(options->reqmask, DHO_DNSSERVER);
-			del_requestmask(options->reqmask, DHO_DNSDOMAIN);
-			del_requestmask(options->reqmask, DHO_DNSSEARCH);
+			del_option_mask(options->requestmask, DHO_DNSSERVER);
+			del_option_mask(options->requestmask, DHO_DNSDOMAIN);
+			del_option_mask(options->requestmask, DHO_DNSSEARCH);
 			break;
 		case 'S':
-			add_requestmask(options->reqmask, DHO_MSCSR);
+			add_option_mask(options->requestmask, DHO_MSCSR);
 			break;
 		case 'Y':
-			del_requestmask(options->reqmask, DHO_NISSERVER);
-			del_requestmask(options->reqmask, DHO_NISDOMAIN);
+			del_option_mask(options->requestmask, DHO_NISSERVER);
+			del_option_mask(options->requestmask, DHO_NISDOMAIN);
 			break;
 #endif
 		default: