[3274] Missing changes in dhcp{4,6}.spec added.

diff --git a/doc/guide/bind10-guide.xml b/doc/guide/bind10-guide.xml
index b2acd633fa56016cac81a0301e898f52a0583d5d..e63512f6a72190da075f293a4a933940c2038eb9 100644 (file)
--- a/doc/guide/bind10-guide.xml
+++ b/doc/guide/bind10-guide.xml
@@ -3633,6 +3633,14 @@ $</screen>
 <screen>
 &gt; <userinput>config remove Init/components b10-dhcp4</userinput>
 &gt; <userinput>config commit</userinput>
+</screen>
+      </para>
+      <para>
+        Note that the server was only removed from the list, so BIND10 will not
+        restart it, but the server itself is still running. Hence it is usually
+        desired to stop it:
+<screen>
+&gt; <userinput>Dhcp4 shutdown</userinput>
 </screen>
       </para>
 
@@ -4646,13 +4654,21 @@ Dhcp4/renew-timer       1000    integer (default)
       </para>
       <para>
          To remove <command>b10-dhcp6</command> from the set of running services,
-         the <command>b10-dhcp4</command> is removed from list of Init components:
+         the <command>b10-dhcp6</command> is removed from list of Init components:
 <screen>
 &gt; <userinput>config remove Init/components b10-dhcp6</userinput>
 &gt; <userinput>config commit</userinput>
 </screen>
       </para>
 
+      <para>
+        Note that the server was only removed from the list, so BIND10 will not
+        restart it, but the server itself is still running. Hence it is usually
+        desired to stop it:
+<screen>
+&gt; <userinput>Dhcp6 shutdown</userinput>
+</screen>
+      </para>
 
       <para>
         During start-up the server will detect available network interfaces

diff --git a/src/bin/dhcp4/dhcp4.spec b/src/bin/dhcp4/dhcp4.spec
index 4eddb7b2a87831dab7e1060214872458f25071e6..0777b8ee1e822b9a5108b4a42a577ca7811c2e84 100644 (file)
--- a/src/bin/dhcp4/dhcp4.spec
+++ b/src/bin/dhcp4/dhcp4.spec
@@ -249,16 +249,26 @@
                         "item_default": ""
                     }
                 },
+
+                { "item_name": "client-class",
+                  "item_type": "string",
+                  "item_optional": false,
+                  "item_default": "",
+                  "item_description" : "Restricts access to this subnet to specified client class (if defined)"
+                },
+
                 { "item_name": "relay",
                   "item_type": "map",
                   "item_optional": false,
                   "item_default": {},
+                  "item_description" : "Structure holding optional relay information.",
                   "map_item_spec": [
                       {
                           "item_name": "ip-address",
                           "item_type": "string",
                           "item_optional": false,
-                          "item_default": "0.0.0.0"
+                          "item_default": "0.0.0.0",
+                          "item_description" : "IPv4 address of the relay (optional)."
                       }
                    ]
                 },

diff --git a/src/bin/dhcp6/dhcp6.spec b/src/bin/dhcp6/dhcp6.spec
index 3810fadf6842ed1284fef5b216aafeb04e12ac9b..7978de6eb321e99284da1936c2cae144d97736f9 100644 (file)
--- a/src/bin/dhcp6/dhcp6.spec
+++ b/src/bin/dhcp6/dhcp6.spec
@@ -254,6 +254,30 @@
                         "item_default": ""
                     }
                 },
+
+                { "item_name": "client-class",
+                  "item_type": "string",
+                  "item_optional": false,
+                  "item_default": "",
+                  "item_description" : "Restricts access to this subnet to specified client class (if defined)"
+                },
+
+                { "item_name": "relay",
+                  "item_type": "map",
+                  "item_optional": false,
+                  "item_default": {},
+                  "item_description" : "Structure holding optional relay information.",
+                  "map_item_spec": [
+                      {
+                          "item_name": "ip-address",
+                          "item_type": "string",
+                          "item_optional": false,
+                          "item_default": "::",
+                          "item_description" : "IPv6 address of the relay (optional)."
+                      }
+                   ]
+                },
+
                 {
                   "item_name": "pd-pools",
                   "item_type": "list",