diff options
| author | Thomas Markwalder <tmark@isc.org> | 2016-03-04 14:16:29 -0500 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2016-03-04 14:16:29 -0500 |
| commit | cc1bd34e09bad3313a16d89f7ad491ff16754dc7 (patch) | |
| tree | aefafa2e9b960601a4071c684b1dc58905be90d3 /server/db.c | |
| parent | 7f4e6f97789799a76aa0b8b5ffab39042bcbff5e (diff) | |
| download | isc-dhcp-cc1bd34e09bad3313a16d89f7ad491ff16754dc7.tar.gz | |
[master] Added lease-id-format to server and client
Merges in rt26378
Diffstat (limited to 'server/db.c')
| -rw-r--r-- | server/db.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/server/db.c b/server/db.c index 645ea0dc..0eaa8d12 100644 --- a/server/db.c +++ b/server/db.c @@ -3,7 +3,7 @@ Persistent database management routines for DHCPD... */ /* - * Copyright (c) 2012-2015 by Internet Systems Consortium, Inc. ("ISC") + * Copyright (c) 2012-2016 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 2004-2010 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1995-2003 by Internet Software Consortium * @@ -56,10 +56,10 @@ write_binding_scope(FILE *db_file, struct binding *bnd, char *prepend) { if (bnd->value->type == binding_data) { if (bnd->value->value.data.data != NULL) { s = quotify_buf(bnd->value->value.data.data, - bnd->value->value.data.len, MDL); + bnd->value->value.data.len, '"', MDL); if (s != NULL) { errno = 0; - fprintf(db_file, "%sset %s = \"%s\";", + fprintf(db_file, "%sset %s = %s;", prepend, bnd->name, s); dfree(s, MDL); if (errno) @@ -207,10 +207,11 @@ int write_lease (lease) ++errors; } if (lease -> uid_len) { - s = quotify_buf (lease -> uid, lease -> uid_len, MDL); + s = format_lease_id(lease->uid, lease->uid_len, lease_id_format, + MDL); if (s) { errno = 0; - fprintf (db_file, "\n uid \"%s\";", s); + fprintf (db_file, "\n uid %s;", s); if (errno) ++errors; dfree (s, MDL); @@ -539,23 +540,23 @@ write_ia(const struct ia_xx *ia) { ++count; } - - s = quotify_buf(ia->iaid_duid.data, ia->iaid_duid.len, MDL); + s = format_lease_id(ia->iaid_duid.data, ia->iaid_duid.len, + lease_id_format, MDL); if (s == NULL) { goto error_exit; } switch (ia->ia_type) { case D6O_IA_NA: - fprintf_ret = fprintf(db_file, "ia-na \"%s\" {\n", s); + fprintf_ret = fprintf(db_file, "ia-na %s {\n", s); break; case D6O_IA_TA: - fprintf_ret = fprintf(db_file, "ia-ta \"%s\" {\n", s); + fprintf_ret = fprintf(db_file, "ia-ta %s {\n", s); break; case D6O_IA_PD: - fprintf_ret = fprintf(db_file, "ia-pd \"%s\" {\n", s); + fprintf_ret = fprintf(db_file, "ia-pd %s {\n", s); break; default: - log_error("Unknown ia type %u for \"%s\" at %s:%d", + log_error("Unknown ia type %u for %s at %s:%d", (unsigned)ia->ia_type, s, MDL); fprintf_ret = -1; } @@ -712,7 +713,8 @@ write_server_duid(void) { */ memset(&server_duid, 0, sizeof(server_duid)); copy_server_duid(&server_duid, MDL); - s = quotify_buf(server_duid.data, server_duid.len, MDL); + s = format_lease_id(server_duid.data, server_duid.len, lease_id_format, + MDL); data_string_forget(&server_duid, MDL); if (s == NULL) { goto error_exit; @@ -721,7 +723,7 @@ write_server_duid(void) { /* * Write to the leases file. */ - fprintf_ret = fprintf(db_file, "server-duid \"%s\";\n\n", s); + fprintf_ret = fprintf(db_file, "server-duid %s;\n\n", s); dfree(s, MDL); if (fprintf_ret < 0) { goto error_exit; @@ -1183,7 +1185,6 @@ int new_lease_file () if (errno) goto fail; - /* At this point we have a new lease file that, so far, could not * be described as either corrupt nor valid. */ |