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

- Do better error checking on lease write.

Browse Source 
- Write quoted strings with special characters quoted.
This commit is contained in:
Ted Lemon
2001-03-15 23:12:03 +00:00
parent d2ff2ec298
commit dd215f30ff
1 changed files with 75 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
client/dhclient.c
View File

@@ -41,7 +41,7 @@
#ifndef lint #ifndef lint
static char ocopyright[] = static char ocopyright[] =
"$Id: dhclient.c,v 1.123 2001/03/14 15:37:52 mellon Exp $ Copyright (c) 1995-2001 Internet Software Consortium. All rights reserved.\n"; "$Id: dhclient.c,v 1.124 2001/03/15 23:12:03 mellon Exp $ Copyright (c) 1995-2001 Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -2121,6 +2121,7 @@ int write_client_lease (client, lease, rewrite, makesure)
struct data_string ds; struct data_string ds;
pair *hash; pair *hash;
int errors = 0; int errors = 0;
char *s;
if (!rewrite) { if (!rewrite) {
if (leases_written++ > 20) { if (leases_written++ > 20) {
@@ -2142,23 +2143,69 @@ int write_client_lease (client, lease, rewrite, makesure)
errno = 0; errno = 0;
fprintf (leaseFile, "lease {\n"); fprintf (leaseFile, "lease {\n");
if (lease -> is_bootp) if (lease -> is_bootp) {
fprintf (leaseFile, " bootp;\n"); fprintf (leaseFile, " bootp;\n");
if (errno) {
++errors;
errno = 0;
}
}
fprintf (leaseFile, " interface \"%s\";\n", fprintf (leaseFile, " interface \"%s\";\n",
client -> interface -> name); client -> interface -> name);
if (client -> name) if (errno) {
++errors;
errno = 0;
}
if (client -> name) {
fprintf (leaseFile, " name \"%s\";\n", client -> name); fprintf (leaseFile, " name \"%s\";\n", client -> name);
if (errno) {
++errors;
errno = 0;
}
}
fprintf (leaseFile, " fixed-address %s;\n", fprintf (leaseFile, " fixed-address %s;\n",
piaddr (lease -> address)); piaddr (lease -> address));
if (lease -> filename) if (errno) {
fprintf (leaseFile, " filename \"%s\";\n", ++errors;
lease -> filename); errno = 0;
if (lease -> server_name) }
fprintf (leaseFile, " server-name \"%s\";\n", if (lease -> filename) {
lease -> server_name); s = quotify_string (lease -> filename, MDL);
if (lease -> medium) if (s) {
fprintf (leaseFile, " medium \"%s\";\n", fprintf (leaseFile, " filename \"%s\";\n", s);
lease -> medium -> string); if (errno) {
++errors;
errno = 0;
}
dfree (s, MDL);
} else
errors++;
}
if (lease -> server_name) {
s = quotify_string (lease -> filename, MDL);
if (s) {
fprintf (leaseFile, " server-name \"%s\";\n", s);
if (errno) {
++errors;
errno = 0;
}
dfree (s, MDL);
} else
++errors;
}
if (lease -> medium) {
s = quotify_string (lease -> medium -> string, MDL);
if (s) {
fprintf (leaseFile, " medium \"%s\";\n", s);
if (errno) {
++errors;
errno = 0;
}
dfree (s, MDL);
} else
errors++;
}
if (errno != 0) { if (errno != 0) {
errors++; errors++;
errno = 0; errno = 0;
@@ -2183,19 +2230,35 @@ int write_client_lease (client, lease, rewrite, makesure)
t -> tm_wday, t -> tm_year + 1900, t -> tm_wday, t -> tm_year + 1900,
t -> tm_mon + 1, t -> tm_mday, t -> tm_mon + 1, t -> tm_mday,
t -> tm_hour, t -> tm_min, t -> tm_sec); t -> tm_hour, t -> tm_min, t -> tm_sec);
if (errno != 0) {
errors++;
errno = 0;
}
t = gmtime (&lease -> rebind); t = gmtime (&lease -> rebind);
fprintf (leaseFile, fprintf (leaseFile,
" rebind %d %d/%d/%d %02d:%02d:%02d;\n", " rebind %d %d/%d/%d %02d:%02d:%02d;\n",
t -> tm_wday, t -> tm_year + 1900, t -> tm_wday, t -> tm_year + 1900,
t -> tm_mon + 1, t -> tm_mday, t -> tm_mon + 1, t -> tm_mday,
t -> tm_hour, t -> tm_min, t -> tm_sec); t -> tm_hour, t -> tm_min, t -> tm_sec);
if (errno != 0) {
errors++;
errno = 0;
}
t = gmtime (&lease -> expiry); t = gmtime (&lease -> expiry);
fprintf (leaseFile, fprintf (leaseFile,
" expire %d %d/%d/%d %02d:%02d:%02d;\n", " expire %d %d/%d/%d %02d:%02d:%02d;\n",
t -> tm_wday, t -> tm_year + 1900, t -> tm_wday, t -> tm_year + 1900,
t -> tm_mon + 1, t -> tm_mday, t -> tm_mon + 1, t -> tm_mday,
t -> tm_hour, t -> tm_min, t -> tm_sec); t -> tm_hour, t -> tm_min, t -> tm_sec);
if (errno != 0) {
errors++;
errno = 0;
}
fprintf (leaseFile, "}\n"); fprintf (leaseFile, "}\n");
if (errno != 0) {
errors++;
errno = 0;
}
fflush (leaseFile); fflush (leaseFile);
if (errno != 0) { if (errno != 0) {
errors++; errors++;