BIND 10 pd-ietf-demo, updated. 67975b73c1123195b06b43062481599818b13a79 Merge branch 'trac3194' into pd-ietf-demo

[BIND 10 source code commits]

The branch, pd-ietf-demo has been updated
       via  67975b73c1123195b06b43062481599818b13a79 (commit)
       via  316c3b7cf5e2f298b10b27defe061774e4a06735 (commit)
      from  7b04f97e186aa9e9b3a4cda775e79fafc35e3843 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 67975b73c1123195b06b43062481599818b13a79
Merge: 7b04f97 316c3b7
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Wed Oct 16 19:54:24 2013 +0200

    Merge branch 'trac3194' into pd-ietf-demo

commit 316c3b7cf5e2f298b10b27defe061774e4a06735
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Wed Oct 16 19:54:14 2013 +0200

    [3194] tftp-servers/time-servers vendor option code fix

-----------------------------------------------------------------------

Summary of changes:
 src/lib/dhcp/docsis3_option_defs.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dhcp/docsis3_option_defs.h b/src/lib/dhcp/docsis3_option_defs.h
index c8cb606..9707e5d 100644
--- a/src/lib/dhcp/docsis3_option_defs.h
+++ b/src/lib/dhcp/docsis3_option_defs.h
@@ -50,7 +50,7 @@ const OptionDefParams DOCSIS3_V6_DEFS[] = {
     { "device-type",    DOCSIS3_V6_DEVICE_TYPE, OPT_STRING_TYPE, false, NO_RECORD_DEF, "" },
     { "vendor-type",    DOCSIS3_V6_VENDOR_NAME, OPT_STRING_TYPE, false, NO_RECORD_DEF, "" },
     { "tftp-servers",   DOCSIS3_V6_TFTP_SERVERS, OPT_IPV6_ADDRESS_TYPE, true, NO_RECORD_DEF, "" },
-    { "time-servers",   DOCSIS3_V6_TFTP_SERVERS, OPT_IPV6_ADDRESS_TYPE, true, NO_RECORD_DEF, "" },
+    { "time-servers",   DOCSIS3_V6_TIME_SERVERS, OPT_IPV6_ADDRESS_TYPE, true, NO_RECORD_DEF, "" },
     { "config-file",    DOCSIS3_V6_CONFIG_FILE, OPT_STRING_TYPE, false, NO_RECORD_DEF, "" },
     { "syslog-servers", DOCSIS3_V6_SYSLOG_SERVERS, OPT_IPV6_ADDRESS_TYPE, true, NO_RECORD_DEF, "" },
     { "time-offset",    DOCSIS3_V6_TIME_OFFSET, OPT_INT32_TYPE, false, NO_RECORD_DEF, "" }