BIND 10 trac1281, updated. 4568f3ae526352f65e3785fa46e0589afa36ff85 [1281] Python DHCPv6 test now prints out a clarification.

[BIND 10 source code commits]

The branch, trac1281 has been updated
       via  4568f3ae526352f65e3785fa46e0589afa36ff85 (commit)
       via  7538a37ca0a746795782ccc1ae27db6794266502 (commit)
       via  d577a668b1fc70856a3020b4ddbc257f935cd237 (commit)
      from  483921a7f9c8afd22aa8f86dcb7b19a94514fb0d (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 4568f3ae526352f65e3785fa46e0589afa36ff85
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Fri May 18 13:39:57 2012 +0200

    [1281] Python DHCPv6 test now prints out a clarification.

commit 7538a37ca0a746795782ccc1ae27db6794266502
Merge: 483921a7f9c8afd22aa8f86dcb7b19a94514fb0d d577a668b1fc70856a3020b4ddbc257f935cd237
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Fri May 18 13:05:42 2012 +0200

    Merge branch 'master' into trac1281

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

Summary of changes:
 src/bin/dhcp6/tests/dhcp6_test.py |   13 ++++++++-----
 src/lib/dhcp/Makefile.am          |    5 +++--
 2 files changed, 11 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp6/tests/dhcp6_test.py b/src/bin/dhcp6/tests/dhcp6_test.py
index e080c77..85732a1 100644
--- a/src/bin/dhcp6/tests/dhcp6_test.py
+++ b/src/bin/dhcp6/tests/dhcp6_test.py
@@ -26,8 +26,14 @@ import isc
 
 class TestDhcpv6Daemon(unittest.TestCase):
     def setUp(self):
-        # redirect stdout to a pipe so we can check that our
-        # process spawning is doing the right thing with stdout
+
+        # Let's print this out before we redirect out stdout.
+        print("Please ignore any socket errors. Purpose of this test is to")
+        print("verify that DHCPv6 process could be started, not that socket")
+        print("could be bound. Binding fails when run as non-root user.")
+
+        # Redirect stdout to a pipe so we can check that our
+        # process spawning is doing the right thing with stdout.
         self.old_stdout = os.dup(sys.stdout.fileno())
         self.pipes = os.pipe()
         os.dup2(self.pipes[1], sys.stdout.fileno())
@@ -36,9 +42,6 @@ class TestDhcpv6Daemon(unittest.TestCase):
         # to the main program ASAP in each test... this prevents
         # hangs reading from the child process (as the pipe is only
         # open in the child), and also insures nice pretty output
-        print("Please ignore any socket errors. Purpose of this test is to")
-        print("verify that DHCPv6 process could be started, not that socket")
-        print("could be bound. Binding fails when run as non-root user.")
 
     def tearDown(self):
         # clean up our stdout munging
diff --git a/src/lib/dhcp/Makefile.am b/src/lib/dhcp/Makefile.am
index d6af32c..9e6fb0c 100644
--- a/src/lib/dhcp/Makefile.am
+++ b/src/lib/dhcp/Makefile.am
@@ -28,5 +28,6 @@ EXTRA_DIST  = README
 
 libdhcp___la_CXXFLAGS = $(AM_CXXFLAGS)
 libdhcp___la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
-libdhcp___la_LIBADD   = $(top_builddir)/src/lib/util/libutil.la
-libdhcp___la_LDFLAGS = -no-undefined -version-info 1:0:0
+libdhcp___la_LIBADD   = $(top_builddir)/src/lib/asiolink/libasiolink.la
+libdhcp___la_LIBADD  += $(top_builddir)/src/lib/util/libutil.la
+libdhcp___la_LDFLAGS  = -no-undefined -version-info 1:0:0