diff options
| author | Shawn Routhier <sar@isc.org> | 2014-04-25 10:50:24 -0700 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.org> | 2014-04-25 10:50:24 -0700 |
| commit | 38c4774a4324a16f0a9f39950700699949acb362 (patch) | |
| tree | bb2da2f818d6eb7d362daaca512990bf3aa1a202 /server/confpars.c | |
| parent | 57187138e0098a281b689de6170325d4c9fe4c0b (diff) | |
| download | isc-dhcp-38c4774a4324a16f0a9f39950700699949acb362.tar.gz | |
[master] Several small patches
Tidy up several small tickets
Correct parsing of DUID from config file, previously the LL type
was put in the wrong place in the DUID string.
[ISC-Bugs #20962]
Add code to parse "do-forward-updates" as well as "do-forward-update"
[ISC-Bugs #31328]
Remove log_priority as it isn't currently used.
[ISC-Bugs #33397]
Increase the size of the buffer used for reading interface information.
[ISC-Bugs #34858]
Diffstat (limited to 'server/confpars.c')
| -rw-r--r-- | server/confpars.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/confpars.c b/server/confpars.c index 352b6a6c..a8fe1fb4 100644 --- a/server/confpars.c +++ b/server/confpars.c @@ -5951,7 +5951,7 @@ parse_server_duid_conf(struct parse *cfile) { } duid.data = (unsigned char *)duid.buffer->data; putUShort(duid.buffer->data, DUID_LL); - putULong(duid.buffer->data + 2, ll_type); + putUShort(duid.buffer->data + 2, ll_type); memcpy(duid.buffer->data + 4, ll_addr.data, ll_addr.len); @@ -6015,7 +6015,7 @@ parse_server_duid_conf(struct parse *cfile) { } duid.data = (unsigned char *)duid.buffer->data; putUShort(duid.buffer->data, DUID_LLT); - putULong(duid.buffer->data + 2, ll_type); + putUShort(duid.buffer->data + 2, ll_type); putULong(duid.buffer->data + 4, llt_time); memcpy(duid.buffer->data + 8, ll_addr.data, ll_addr.len); |