7388 Support DHCP Client FQDN. Allow IAID/DUID for all v4.

@@ -21,10 +21,11 @@
  */
 
 /*
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright (c) 2016, Chris Fraire <cfraire@me.com>.
  */
 
 #include <stdio.h>
 #include <sys/types.h>
 

@@ -65,10 +66,11 @@
 %token LOC_LDAP_CONFIGSRC LOC_LDAP_SERVERS
 %token LOC_DEFAULT_DOMAIN LOC_NFSV4_DOMAIN
 %token LOC_IPF_CONFIG LOC_IPF_V6_CONFIG
 %token LOC_IPNAT_CONFIG LOC_IPPOOL_CONFIG LOC_IKE_CONFIG LOC_IPSECPOL_CONFIG
 %token WLAN_BSSIDS WLAN_PRIORITY WLAN_KEYNAME WLAN_KEYSLOT WLAN_SECURITY_MODE
+%token IP_PRIMARY IP_REQHOST
 
 %type <strval> TOKEN EQUAL OPTION
 %type <ival> resource1_type LOC NCP ENM WLAN
 %type <ival> resource2_type NCU
 %type <ival> ncu_class_type PHYS IP

@@ -84,10 +86,11 @@
     LOC_LDAP_CONFIGSRC LOC_LDAP_SERVERS
     LOC_DEFAULT_DOMAIN LOC_NFSV4_DOMAIN
     LOC_IPF_CONFIG LOC_IPF_V6_CONFIG
     LOC_IPNAT_CONFIG LOC_IPPOOL_CONFIG LOC_IKE_CONFIG LOC_IPSECPOL_CONFIG
     WLAN_BSSIDS WLAN_PRIORITY WLAN_KEYNAME WLAN_KEYSLOT WLAN_SECURITY_MODE
+    IP_PRIMARY IP_REQHOST
 %type <cmd> command
 %type <cmd> cancel_command CANCEL
 %type <cmd> clear_command CLEAR
 %type <cmd> commit_command COMMIT
 %type <cmd> create_command CREATE

@@ -615,15 +618,30 @@
         |       LIST resource1_type
         {
                 command_usage(CMD_LIST);
                 YYERROR;
         }
+        |       LIST OPTION resource1_type
+        {
+                command_usage(CMD_LIST);
+                YYERROR;
+        }
         |       LIST resource2_type
         {
                 command_usage(CMD_LIST);
                 YYERROR;
         }
+        |       LIST OPTION resource2_type
+        {
+                command_usage(CMD_LIST);
+                YYERROR;
+        }
+        |       LIST OPTION resource2_type ncu_class_type
+        {
+                command_usage(CMD_LIST);
+                YYERROR;
+        }
         |       LIST resource1_type TOKEN
         {
                 /* list enm/loc/ncp test */
                 if (($$ = alloc_cmd()) == NULL)
                         YYERROR;

@@ -741,10 +759,15 @@
         |       SELECT resource2_type
         {
                 command_usage(CMD_SELECT);
                 YYERROR;
         }
+        |       SELECT resource2_type ncu_class_type
+        {
+                command_usage(CMD_SELECT);
+                YYERROR;
+        }
         |       SELECT resource1_type TOKEN
         {
                 /* select enm/loc/ncp test */
                 if (($$ = alloc_cmd()) == NULL)
                         YYERROR;

@@ -898,7 +921,9 @@
         |       WLAN_BSSIDS             { $$ = PT_WLAN_BSSIDS; }
         |       WLAN_PRIORITY           { $$ = PT_WLAN_PRIORITY; }
         |       WLAN_KEYNAME            { $$ = PT_WLAN_KEYNAME; }
         |       WLAN_KEYSLOT            { $$ = PT_WLAN_KEYSLOT; }
         |       WLAN_SECURITY_MODE      { $$ = PT_WLAN_SECURITY_MODE; }
+        |       IP_PRIMARY              { $$ = PT_IP_PRIMARY; }
+        |       IP_REQHOST              { $$ = PT_IP_REQHOST; }
 
 %%