mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-04 00:05:30 +00:00
Code Issues Releases Wiki Activity

- A bug was fixed in dhclient rendering the textual output form of the

Browse Source 
domain-search option syntax. [ISC-Bugs #16586]
This commit is contained in:
David Hankins
2007-01-11 16:31:51 +00:00
parent bd2bc2faee
commit 85edef5cfe
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
RELNOTES
View File

@@ -31,6 +31,9 @@ the README file.
- A bug was fixed where attempting to permit leasequeries results in a - A bug was fixed where attempting to permit leasequeries results in a
fatal internal error, "Unable to find server option 49". fatal internal error, "Unable to find server option 49".
- A bug was fixed in dhclient rendering the textual output form of the
domain-search option syntax.
Changes since 3.1.0a1 Changes since 3.1.0a1
- A bug in the FQDN universe that added FQDN codes to the NWIP universe's - A bug in the FQDN universe that added FQDN codes to the NWIP universe's

19
common/options.c
View File

@@ -34,7 +34,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: options.c,v 1.101 2006/11/09 22:08:28 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium. All rights reserved.\n"; "$Id: options.c,v 1.102 2007/01/11 16:31:51 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#define DHCP_OPTION_DATA #define DHCP_OPTION_DATA
@@ -1309,8 +1309,8 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
int numelem = 0; int numelem = 0;
int count; int count;
int i, j, k, l; int i, j, k, l;
char fmtbuf [32]; char fmtbuf[32] = "";
struct enumeration *enumbuf [32]; struct enumeration *enumbuf[32]; /* MUST be same as fmtbuf */
char *op = optbuf; char *op = optbuf;
const unsigned char *dp = data; const unsigned char *dp = data;
struct in_addr foo; struct in_addr foo;
@@ -1326,6 +1326,10 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
/* Figure out the size of the data. */ /* Figure out the size of the data. */
for (l = i = 0; option -> format [i]; i++, l++) { for (l = i = 0; option -> format [i]; i++, l++) {
if (l >= sizeof(fmtbuf) - 1)
log_fatal("Bounds failure on internal buffer at "
"%s:%d.", MDL);
if (!numhunk) { if (!numhunk) {
log_error ("%s: Extra codes in format string: %s", log_error ("%s: Extra codes in format string: %s",
option -> name, option -> name,
@@ -1336,10 +1340,6 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
fmtbuf [l] = option -> format [i]; fmtbuf [l] = option -> format [i];
switch (option -> format [i]) { switch (option -> format [i]) {
case 'a': case 'a':
--numelem;
fmtbuf [l] = 0;
numhunk = 0;
break;
case 'A': case 'A':
--numelem; --numelem;
fmtbuf [l] = 0; fmtbuf [l] = 0;
@@ -1350,6 +1350,7 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
while (option -> format [i] && while (option -> format [i] &&
option -> format [i] != '.') option -> format [i] != '.')
i++; i++;
/* Fall Through! */
case 'X': case 'X':
for (k = 0; k < len; k++) { for (k = 0; k < len; k++) {
if (!isascii (data [k]) || if (!isascii (data [k]) ||
@@ -1371,8 +1372,10 @@ const char *pretty_print_option (option, data, len, emit_commas, emit_quotes)
fmtbuf [l + 1] = 0; fmtbuf [l + 1] = 0;
break; break;
case 'd': case 'd':
fmtbuf[l] = 't';
/* Fall Through! */
case 't': case 't':
fmtbuf [l] = 't'; case 'D':
fmtbuf [l + 1] = 0; fmtbuf [l + 1] = 0;
numhunk = -2; numhunk = -2;
break; break;