[dhcp-agent-commits] dhcp-agent/src dhcp-client-states.c,1.24,1.25 dhcp-sysconf.c,1.14,1.15

[<act...@us...>]

Update of /cvsroot/dhcp-agent/dhcp-agent/src
In directory sc8-pr-cvs1:/tmp/cvs-serv12551

Modified Files:
	dhcp-client-states.c dhcp-sysconf.c 
Log Message:
brought inline with new conf code

Index: dhcp-client-states.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-client-states.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** dhcp-client-states.c	2 Jan 2003 04:23:01 -0000	1.24
--- dhcp-client-states.c	25 Mar 2003 03:06:42 -0000	1.25
***************
*** 104,108 ****
  
      options = list_create();
!     option = dhcp_build_parameter_request_list_option(client_conf_get_opt_bit_array(dc->conf));
      if(option == NULL) {
          WARN_MESSAGE("sending with empty parameter request list");
--- 104,108 ----
  
      options = list_create();
!     option = dhcp_build_parameter_request_list_option(client_conf_get_request_opt_bit_array(dc->conf));
      if(option == NULL) {
          WARN_MESSAGE("sending with empty parameter request list");

Index: dhcp-sysconf.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/src/dhcp-sysconf.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** dhcp-sysconf.c	3 Jan 2003 22:05:08 -0000	1.14
--- dhcp-sysconf.c	25 Mar 2003 03:06:42 -0000	1.15
***************
*** 478,483 ****
       * if so get the bit array. */
  
!     if(client_conf_get_opt_configure_set(dc->conf, dhcp_client_get_server_ip_address(dc), 
!                                          dhcp_client_get_server_hw_address(dc))) {
  
          configure_opts = client_conf_get_opt_configure_bit_array(dc->conf, 
--- 478,483 ----
       * if so get the bit array. */
  
!     if(client_conf_get_opt_configure_bit_array(dc->conf, dhcp_client_get_server_ip_address(dc), 
!                                                dhcp_client_get_server_hw_address(dc))) {
  
          configure_opts = client_conf_get_opt_configure_bit_array(dc->conf,