aboutsummaryrefslogtreecommitdiff
path: root/cftoken.l
diff options
context:
space:
mode:
authorSUZUKI, Shinsuke <suz@kame.net>2006-10-01 08:31:41 +0000
committerBjørn Mork <bjorn@mork.no>2010-08-06 15:37:36 +0200
commit683f103906f5d5d3d08aa937cb1783264ba549ad (patch)
tree3c1e54f85e4f9366e9cdce4845cd15b02922e85e /cftoken.l
parent4220cf7c6979972adfb231e5851b667eea588b19 (diff)
accepted "nis-domain-name" and "nisp-domain-name" as a configuration keyword for NIS/NIS+ domain name, as well as nis/nisp-server-domain-name. (Bug-ID 1566494)
Diffstat (limited to 'cftoken.l')
-rw-r--r--cftoken.l8
1 files changed, 6 insertions, 2 deletions
diff --git a/cftoken.l b/cftoken.l
index 0bdbca2..7e37b51 100644
--- a/cftoken.l
+++ b/cftoken.l
@@ -199,13 +199,17 @@ ecl \}
<S_CNF>sip-server-domain-name { DECHO; return (SIP_NAME); }
<S_CNF>ntp-servers { DECHO; return (NTP_SERVERS); }
<S_CNF>nis-server-address { DECHO; return (NIS_SERVERS); }
-<S_CNF>nis-server-domain-name { DECHO; return (NIS_NAME); }
+<S_CNF>nis-domain-name { DECHO; return (NIS_NAME); }
<S_CNF>nisp-server-address { DECHO; return (NISP_SERVERS); }
-<S_CNF>nisp-server-domain-name { DECHO; return (NISP_NAME); }
+<S_CNF>nisp-domain-name { DECHO; return (NISP_NAME); }
<S_CNF>bcmcs-server-address { DECHO; return (BCMCS_SERVERS); }
<S_CNF>bcmcs-server-domain-name { DECHO; return (BCMCS_NAME); }
<S_CNF>refreshtime { DECHO; return (REFRESHTIME); }
+/* provided for a backward compatibility to WIDE-DHCPv6 before Oct 1 2006 */
+<S_CNF>nis-server-domain-name { DECHO; return (NIS_NAME); }
+<S_CNF>nisp-server-domain-name { DECHO; return (NISP_NAME); }
+
/* generic options */
<S_CNF>information-only { DECHO; return (INFO_ONLY); }