[BACK]Return to lease.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / dnsmasq / src

Diff for /embedaddon/dnsmasq/src/lease.c between versions 1.1.1.4 and 1.1.1.5

version 1.1.1.4, 2021/03/17 00:56:46 version 1.1.1.5, 2023/09/27 11:02:07
Line 1 Line 1
/* dnsmasq is Copyright (c) 2000-2021 Simon Kelley/* dnsmasq is Copyright (c) 2000-2022 Simon Kelley
   
    This program is free software; you can redistribute it and/or modify     This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by     it under the terms of the GNU General Public License as published by
Line 378  void lease_update_file(time_t now) Line 378  void lease_update_file(time_t now)
       if (next_event == 0 || difftime(next_event, LEASE_RETRY + now) > 0.0)        if (next_event == 0 || difftime(next_event, LEASE_RETRY + now) > 0.0)
         next_event = LEASE_RETRY + now;          next_event = LEASE_RETRY + now;
               
      my_syslog(MS_DHCP | LOG_ERR, _("failed to write %s: %s (retry in %us)"),       my_syslog(MS_DHCP | LOG_ERR, _("failed to write %s: %s (retry in %u s)"), 
                 daemon->lease_file, strerror(err),                  daemon->lease_file, strerror(err),
                 (unsigned int)difftime(next_event, now));                  (unsigned int)difftime(next_event, now));
     }      }
Line 1021  void lease_set_hostname(struct dhcp_lease *lease, cons Line 1021  void lease_set_hostname(struct dhcp_lease *lease, cons
             }              }
                   
           kill_name(lease_tmp);            kill_name(lease_tmp);
             lease_tmp->flags |= LEASE_CHANGED; /* run script on change */
           break;            break;
         }          }
     }      }
Line 1179  void lease_add_extradata(struct dhcp_lease *lease, uns Line 1180  void lease_add_extradata(struct dhcp_lease *lease, uns
   if ((lease->extradata_size - lease->extradata_len) < (len + 1))    if ((lease->extradata_size - lease->extradata_len) < (len + 1))
     {      {
       size_t newsz = lease->extradata_len + len + 100;        size_t newsz = lease->extradata_len + len + 100;
      unsigned char *new = whine_malloc(newsz);      unsigned char *new = whine_realloc(lease->extradata, newsz);
       
       if (!new)        if (!new)
         return;          return;
               
       if (lease->extradata)  
         {  
           memcpy(new, lease->extradata, lease->extradata_len);  
           free(lease->extradata);  
         }  
   
       lease->extradata = new;        lease->extradata = new;
       lease->extradata_size = newsz;        lease->extradata_size = newsz;
     }      }
Line 1201  void lease_add_extradata(struct dhcp_lease *lease, uns Line 1196  void lease_add_extradata(struct dhcp_lease *lease, uns
 }  }
 #endif  #endif
   
#endif#endif /* HAVE_DHCP */
           
 
       
 
Removed from v.1.1.1.4  
changed lines
  Added in v.1.1.1.5

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>