diff options
| author | obrien <obrien@FreeBSD.org> | 2000-11-04 20:14:55 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2000-11-04 20:14:55 +0000 |
| commit | 5080871f52b54bfc3f979d2bf46f2714d60c61ed (patch) | |
| tree | 076b541f42f1c4c8c84716fcfbcf8ced9ca3fec6 /contrib/isc-dhcp | |
| parent | fc00659ff5e60352a5570f9f32161f5a1d29a72a (diff) | |
| parent | 7acb11388cf5d680b16902b8ed6f46c46dc4d47b (diff) | |
| download | FreeBSD-src-5080871f52b54bfc3f979d2bf46f2714d60c61ed.zip FreeBSD-src-5080871f52b54bfc3f979d2bf46f2714d60c61ed.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r68325,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/isc-dhcp')
| -rw-r--r-- | contrib/isc-dhcp/common/options.c | 10 | ||||
| -rw-r--r-- | contrib/isc-dhcp/includes/version.h | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/contrib/isc-dhcp/common/options.c b/contrib/isc-dhcp/common/options.c index b80ffa1..b840716 100644 --- a/contrib/isc-dhcp/common/options.c +++ b/contrib/isc-dhcp/common/options.c @@ -553,9 +553,13 @@ char *pretty_print_option (code, data, len, emit_commas, emit_quotes) for (; dp < data + len; dp++) { if (!isascii (*dp) || !isprint (*dp)) { - sprintf (op, "\\%03o", - *dp); - op += 4; + /* Skip trailing NUL. */ + if (dp + 1 != data + len || + *dp != 0) { + sprintf (op, "\\%03o", + *dp); + op += 4; + } } else if (*dp == '"' || *dp == '\'' || *dp == '$' || diff --git a/contrib/isc-dhcp/includes/version.h b/contrib/isc-dhcp/includes/version.h index 303fbfa..45b89ff 100644 --- a/contrib/isc-dhcp/includes/version.h +++ b/contrib/isc-dhcp/includes/version.h @@ -1,3 +1,3 @@ /* Current version of ISC DHCP Distribution. */ -#define DHCP_VERSION "2.0pl5" +#define DHCP_VERSION "2.0pl5+v3_fixes" |
