[Dhcp-agent-commits] dhcp-agent dhcp-client-cache.c,1.15,1.16 dhcp-client-conf.c,1.14,1.15 dhcp-client.c,1.40,1.41 dhcp-convert.c,1.17,1.18

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

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

Modified Files:
	dhcp-client-cache.c dhcp-client-conf.c dhcp-client.c 
	dhcp-convert.c 
Log Message:
fixes to previous update; names were being munged in some places; and conversion was not done right in network addr list

Index: dhcp-client-cache.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-client-cache.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** dhcp-client-cache.c	3 Jul 2002 00:51:39 -0000	1.15
--- dhcp-client-cache.c	3 Jul 2002 01:24:20 -0000	1.16
***************
*** 132,136 ****
      char *fname;
      stringbuffer *sb = create_stringbuffer();
!     stringbuffer_aprintf(sb, "%s.%s", cc->interface, ".cache");
  
      fname = xstrdup(stringbuffer_getstring(sb));
--- 132,136 ----
      char *fname;
      stringbuffer *sb = create_stringbuffer();
!     stringbuffer_aprintf(sb, "%s.%s", cc->interface, "cache");
  
      fname = xstrdup(stringbuffer_getstring(sb));
***************
*** 144,148 ****
      char *fname;
      stringbuffer *sb = create_stringbuffer();
!     stringbuffer_aprintf(sb, "%s.%s", cc->interface, ".cache.tmp");
  
      fname = xstrdup(stringbuffer_getstring(sb));
--- 144,148 ----
      char *fname;
      stringbuffer *sb = create_stringbuffer();
!     stringbuffer_aprintf(sb, "%s.%s", cc->interface, "cache.tmp");
  
      fname = xstrdup(stringbuffer_getstring(sb));

Index: dhcp-client-conf.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-client-conf.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** dhcp-client-conf.c	3 Jul 2002 00:51:39 -0000	1.14
--- dhcp-client-conf.c	3 Jul 2002 01:24:20 -0000	1.15
***************
*** 69,73 ****
      char *fname;
      stringbuffer *sb = create_stringbuffer();
!     stringbuffer_aprintf(sb, "%s.%s", cc->interface, ".opts");
  
      fname = xstrdup(stringbuffer_getstring(sb));
--- 69,73 ----
      char *fname;
      stringbuffer *sb = create_stringbuffer();
!     stringbuffer_aprintf(sb, "%s.%s", cc->interface, "opts");
  
      fname = xstrdup(stringbuffer_getstring(sb));

Index: dhcp-client.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-client.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** dhcp-client.c	3 Jul 2002 00:51:39 -0000	1.40
--- dhcp-client.c	3 Jul 2002 01:24:20 -0000	1.41
***************
*** 95,99 ****
  
      sb = create_stringbuffer();
!     stringbuffer_aprintf(sb, "%s %s", interface, ".conf");
  
      if(init_glob_conf(stringbuffer_getstring(sb))) {
--- 95,99 ----
  
      sb = create_stringbuffer();
!     stringbuffer_aprintf(sb, "%s.%s", interface, "conf");
  
      if(init_glob_conf(stringbuffer_getstring(sb))) {

Index: dhcp-convert.c
===================================================================
RCS file: /cvsroot/dhcp-agent/dhcp-agent/dhcp-convert.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** dhcp-convert.c	3 Jul 2002 00:51:39 -0000	1.17
--- dhcp-convert.c	3 Jul 2002 01:24:20 -0000	1.18
***************
*** 245,249 ****
      sb = create_stringbuffer();
  
!     while(len >= 0) {
  
          string = network_addr_to_string(data, len);
--- 245,249 ----
      sb = create_stringbuffer();
  
!     while(len > 0) {
  
          string = network_addr_to_string(data, len);