BIND 10 master, updated. d84999478ba92ffc94741716d3b6ae8cea91f3fc [master] Added ChangeLog entry 679 for trac 3156

[BIND 10 source code commits]

The branch, master has been updated
       via  d84999478ba92ffc94741716d3b6ae8cea91f3fc (commit)
      from  6e9227b1b15448e834d1f60dd655e5633ff9745c (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 d84999478ba92ffc94741716d3b6ae8cea91f3fc
Author: Thomas Markwalder <tmark at isc.org>
Date:   Tue Sep 24 14:16:34 2013 -0400

    [master] Added ChangeLog entry 679 for trac 3156
    
    Added the ChangeLog entry and fixed a minor clang complain in dhcp6.

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

Summary of changes:
 ChangeLog                              |    5 +++++
 src/bin/dhcp6/dhcp6_srv.h              |    7 -------
 src/lib/dhcpsrv/tests/test_libraries.h |    6 +++---
 3 files changed, 8 insertions(+), 10 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index c64ac31..40348af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+679.	[func]	tmark
+	b10-dhcp-ddns Finite state machine logic was refactored into its own class,
+	StateModel.
+	(Trac# 3156,  git 6e9227b1b15448e834d1f60dd655e5633ff9745c)
+
 678.	[func]	tmark
 	MySQL backend used by b10-dhcp6 now uses lease type as a 
 	filtering parameter in all IPv6 lease queries.
diff --git a/src/bin/dhcp6/dhcp6_srv.h b/src/bin/dhcp6/dhcp6_srv.h
index 9b59ce2..f8f0b2f 100644
--- a/src/bin/dhcp6/dhcp6_srv.h
+++ b/src/bin/dhcp6/dhcp6_srv.h
@@ -473,13 +473,6 @@ private:
     /// initiate server shutdown procedure.
     volatile bool shutdown_;
 
-#if 0
-    /// Indexes for registered hook points
-    int hook_index_pkt6_receive_;
-    int hook_index_subnet6_select_;
-    int hook_index_pkt6_send_;
-#endif
-
     /// UDP port number on which server listens.
     uint16_t port_;
 
diff --git a/src/lib/dhcpsrv/tests/test_libraries.h b/src/lib/dhcpsrv/tests/test_libraries.h
index 03fd5af..e39ecec 100644
--- a/src/lib/dhcpsrv/tests/test_libraries.h
+++ b/src/lib/dhcpsrv/tests/test_libraries.h
@@ -37,13 +37,13 @@ namespace {
 
 // Library with load/unload functions creating marker files to check their
 // operation.
-static const char* CALLOUT_LIBRARY_1 = "/home/thomson/devel/bind10/src/lib/dhcpsrv/tests/.libs/libco1"
+static const char* CALLOUT_LIBRARY_1 = "/Users/tmark/ddns/build/trac3156/bind10/src/lib/dhcpsrv/tests/.libs/libco1"
                                            DLL_SUFFIX;
-static const char* CALLOUT_LIBRARY_2 = "/home/thomson/devel/bind10/src/lib/dhcpsrv/tests/.libs/libco2"
+static const char* CALLOUT_LIBRARY_2 = "/Users/tmark/ddns/build/trac3156/bind10/src/lib/dhcpsrv/tests/.libs/libco2"
                                            DLL_SUFFIX;
 
 // Name of a library which is not present.
-static const char* NOT_PRESENT_LIBRARY = "/home/thomson/devel/bind10/src/lib/dhcpsrv/tests/.libs/libnothere"
+static const char* NOT_PRESENT_LIBRARY = "/Users/tmark/ddns/build/trac3156/bind10/src/lib/dhcpsrv/tests/.libs/libnothere"
                                          DLL_SUFFIX;
 } // anonymous namespace