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)

4 files changed, 16 insertions, 8 deletions

diff --git a/CHANGES b/CHANGES
index f10bee8..3d661a0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 2006-10-01  SUZUKI, Shinsuke <suz@kame.net>
+	* cftoken.l, dhcp6[cs].conf.5: 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)
+
 	* cftoken.l: supported a declaration name (hostname, poolname,
 	  keyname, authname) including "-".  (Bug-ID 1566476)
 
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); }
 
diff --git a/dhcp6c.conf.5 b/dhcp6c.conf.5
index c849a21..611ab4f 100644
--- a/dhcp6c.conf.5
+++ b/dhcp6c.conf.5
@@ -95,7 +95,7 @@ means a SIP server domain name option.
 .Xc
 means a NIS Server address option.
 .It Xo
-.Ic nis-server-domain-name
+.Ic nis-domain-name
 .Xc
 means a NIS domain name option.
 .It Xo
@@ -103,7 +103,7 @@ means a NIS domain name option.
 .Xc
 means a NIS+ Server address option.
 .It Xo
-.Ic nisp-server-domain-name
+.Ic nisp-domain-name
 .Xc
 means a NIS+ domain name option.
 .It Xo
diff --git a/dhcp6s.conf.5 b/dhcp6s.conf.5
index ad5fbc1..08f0b67 100644
--- a/dhcp6s.conf.5
+++ b/dhcp6s.conf.5
@@ -136,9 +136,9 @@ must be a numeric IPv6 address.
 Multiple server addresses can also be specified by a sequence of
 these statements.
 .It Xo
-.Ic nis-server-domain-name Ar \(dqnis-server-domain-name\(dq ;
+.Ic nis-domain-name Ar \(dqnis-domain-name\(dq ;
 .Xc
-provides a domain name of a NIS server.
+provides a NIS domain name.
 Multiple names in the path can be specified by a sequence of these
 statements.
 .It Xo
@@ -151,9 +151,9 @@ must be a numeric IPv6 address.
 Multiple server addresses can also be specified by a sequence of
 these statements.
 .It Xo
-.Ic nisp-server-domain-name Ar \(dqnisp-server-domain-name\(dq ;
+.Ic nisp-domain-name Ar \(dqnisp-domain-name\(dq ;
 .Xc
-provides a domain name of a NIS+ server.
+provides a NIS+ domain name.
 Multiple names in the path can be specified by a sequence of these
 statements.
 .It Xo