[Dhcp-agent-commits] dhcp-agent dhcp-client-states.c,1.23,1.24

[<bk...@us...>]

Update of /cvsroot/dhcp-agent/dhcp-agent
In directory usw-pr-cvs1:/tmp/cvs-serv9002

Modified Files:
	dhcp-client-states.c 
Log Message:
Use STATE_FATAL_ERROR here, too.


Index: dhcp-client-states.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-client-states.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** dhcp-client-states.c	11 Jun 2002 03:06:39 -0000	1.23
--- dhcp-client-states.c	11 Jun 2002 20:06:19 -0000	1.24
***************
*** 199,203 ****
                                client_discover_check))  {
          error_message("timeout on DHCP DISCOVER.");
!         return -1;
      }
      
--- 199,203 ----
                                client_discover_check))  {
          error_message("timeout on DHCP DISCOVER.");
!         return STATE_FATAL_ERROR;
      }
      
***************
*** 218,222 ****
      if(client_cache_dump_options(dc->cache, dc->rawnet->dhcp_p->options))  {
          error_message("could not create temporary cache");
!         return -1;
      }
      
--- 218,222 ----
      if(client_cache_dump_options(dc->cache, dc->rawnet->dhcp_p->options))  {
          error_message("could not create temporary cache");
!         return STATE_FATAL_ERROR;
      }
      
***************
*** 238,242 ****
      if(cache_options == NULL)  {
          error_message("Could not load cache! This is not good!");
!         return -1;
      }
      
--- 238,242 ----
      if(cache_options == NULL)  {
          error_message("Could not load cache! This is not good!");
!         return STATE_FATAL_ERROR;
      }
      
***************
*** 250,254 ****
      if(rawnet_packet_transact(dc->rawnet, dc, NULL, client_request_check))  {
          error_message("timeout on DHCP REQUEST.");
!         return -1;
      }
  
--- 250,254 ----
      if(rawnet_packet_transact(dc->rawnet, dc, NULL, client_request_check))  {
          error_message("timeout on DHCP REQUEST.");
!         return STATE_FATAL_ERROR;
      }
  
***************
*** 271,275 ****
      if(options == NULL)  {
          error_message("received empty configuration cache! cannot configure host");
!         return -1;
      }
  
--- 271,275 ----
      if(options == NULL)  {
          error_message("received empty configuration cache! cannot configure host");
!         return STATE_FATAL_ERROR;
      }
  
***************
*** 331,335 ****
          /* if we have no cache we probably timed out
           * somewhere. Just return. */
!         return -1;
      
      options = join_lists(options, cache_options);
--- 331,335 ----
          /* if we have no cache we probably timed out
           * somewhere. Just return. */
!         return STATE_FATAL_ERROR;
      
      options = join_lists(options, cache_options);
***************
*** 342,346 ****
      if(rawnet_send_packet(dc->rawnet) < 0)  {
          error_message("could not send packet: %s", strerror(errno));
!         return -1;
      }
  
--- 342,346 ----
      if(rawnet_send_packet(dc->rawnet) < 0)  {
          error_message("could not send packet: %s", strerror(errno));
!         return STATE_FATAL_ERROR;
      }