mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-31 06:15:55 +00:00
Code Issues Releases Wiki Activity

- A new common (server or client) option, 'db-time-format local;', has

Browse Source 
been added which prints the local time in /var/db/dhcpd.leases rather
  than UTC.  Thanks to a patch from Ken Lalonde. [ISC-Bugs #2678]
This commit is contained in:
David Hankins
2006-06-06 16:35:18 +00:00
parent d19e2cf7de
commit 5e86441636
8 changed files with 174 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
client/dhclient.c
View File

@@ -32,7 +32,7 @@
#ifndef lint
static char ocopyright[] =
"$Id: dhclient.c,v 1.139 2006/06/01 20:23:16 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium. All rights reserved.\n";
"$Id: dhclient.c,v 1.140 2006/06/06 16:35:18 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -2285,6 +2285,7 @@ int write_client_lease (client, lease, rewrite, makesure)
pair *hash;
int errors = 0;
char *s;
const char *tval;
if (!rewrite) {
if (leases_written++ > 20) {
@@ -2386,49 +2387,27 @@ int write_client_lease (client, lease, rewrite, makesure)
client, write_lease_option);
}
/* Note: the following is not a Y2K bug - it's a Y1.9K bug. Until
somebody invents a time machine, I think we can safely disregard
it. */
t = gmtime (&lease -> renewal);
fprintf (leaseFile,
" renew %d %d/%d/%d %02d:%02d:%02d;\n",
t -> tm_wday, t -> tm_year + 1900,
t -> tm_mon + 1, t -> tm_mday,
t -> tm_hour, t -> tm_min, t -> tm_sec);
if (errno != 0) {
tval = print_time(lease->renewal);
if (tval == NULL ||
fprintf(leaseFile, " renew %s\n", tval) < 0)
errors++;
errno = 0;
}
t = gmtime (&lease -> rebind);
fprintf (leaseFile,
" rebind %d %d/%d/%d %02d:%02d:%02d;\n",
t -> tm_wday, t -> tm_year + 1900,
t -> tm_mon + 1, t -> tm_mday,
t -> tm_hour, t -> tm_min, t -> tm_sec);
if (errno != 0) {
tval = print_time(lease->rebind);
if (tval == NULL ||
fprintf(leaseFile, " rebind %s\n", tval) < 0)
errors++;
errno = 0;
}
t = gmtime (&lease -> expiry);
fprintf (leaseFile,
" expire %d %d/%d/%d %02d:%02d:%02d;\n",
t -> tm_wday, t -> tm_year + 1900,
t -> tm_mon + 1, t -> tm_mday,
t -> tm_hour, t -> tm_min, t -> tm_sec);
if (errno != 0) {
tval = print_time(lease->expiry);
if (tval == NULL ||
fprintf(leaseFile, " expire %s\n", tval) < 0)
errors++;
errno = 0;
}
fprintf (leaseFile, "}\n");
if (errno != 0) {
if (fprintf(leaseFile, "}\n") < 0)
errors++;
errno = 0;
}
fflush (leaseFile);
if (errno != 0) {
if (fflush(leaseFile) != 0)
errors++;
errno = 0;
}
if (!errors && makesure) {
if (fsync (fileno (leaseFile)) < 0) {
log_info ("write_client_lease: %m");