BIND 10 master, updated. be25b97a4ca9f145303e1028bfb59cff19ff39fc [master] Add ChangeLog for #3227

[BIND 10 source code commits]

The branch, master has been updated
       via  be25b97a4ca9f145303e1028bfb59cff19ff39fc (commit)
       via  c517e0fa8f17cdd433bc46905bf6e6521a6560ea (commit)
       via  5ec35e37dbb46f66ff0f6a9d9a6a87a393b37934 (commit)
       via  1a6565ad222a830e630100751371575224bdec0d (commit)
      from  fc1a10ef5bddba38d929774e298c2b66c57c6f42 (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 be25b97a4ca9f145303e1028bfb59cff19ff39fc
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Jan 6 13:06:43 2014 +0530

    [master] Add ChangeLog for #3227

commit c517e0fa8f17cdd433bc46905bf6e6521a6560ea
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Jan 6 13:05:53 2014 +0530

    [master] Delete trailing space and wrap ChangeLog messages to 80 columns

commit 5ec35e37dbb46f66ff0f6a9d9a6a87a393b37934
Merge: fc1a10e 1a6565a
Author: Mukund Sivaraman <muks at isc.org>
Date:   Mon Jan 6 13:03:34 2014 +0530

    Merge branch 'trac3227'

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

Summary of changes:
 ChangeLog                   |   22 ++++++++++++++--------
 src/bin/cmdctl/cmdctl.py.in |   13 ++++++++++++-
 2 files changed, 26 insertions(+), 9 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index d7bad3e..50aa531 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,21 @@
-721.	[func]      tmark
-	Updates the user_chk example hooks shared library with callouts for packet 
-	receive and packet send.  Decision outcome now includes the lease or prefix
-	assigned.  The user registry now supports a default user entry. 
+722.	[bug]		muks
+	b10-cmdctl now prints a more operator-friendly message when the
+	address+port that b10-cmdctl listens on is already in use.
+	(Trac #3227, git 5ec35e37dbb46f66ff0f6a9d9a6a87a393b37934)
+
+721.	[func]		tmark
+	Updates the user_chk example hooks shared library with callouts
+	for packet receive and packet send.  Decision outcome now includes
+	the lease or prefix assigned.  The user registry now supports a
+	default user entry.
 	(Trac #3207, git 34fddf2e75b80d9e517a8f9c3321aa4878cda795)
 
 720.	[func]		tmark
 	Added the initial implementation of the class, NameAddTransaction,
-	to b10-dhcp-ddns.  This class provides a state machine which implements
-	the logic required to remove forward and reverse DNS entries as described
-	in RFC 4703, section 5.5. This includes the ability to construct the
-	necessary DNS requests.
+	to b10-dhcp-ddns.  This class provides a state machine which
+	implements the logic required to remove forward and reverse DNS
+	entries as described in RFC 4703, section 5.5. This includes the
+	ability to construct the necessary DNS requests.
 	(Trac# 3088, git ca58ac00fce4cb5f46e534d7ffadb2db4e4ffaf3)
 
 719.	[func]		tomek
diff --git a/src/bin/cmdctl/cmdctl.py.in b/src/bin/cmdctl/cmdctl.py.in
index 0e716b8..2e56629 100755
--- a/src/bin/cmdctl/cmdctl.py.in
+++ b/src/bin/cmdctl/cmdctl.py.in
@@ -40,6 +40,7 @@ import csv
 import random
 import time
 import signal
+import errno
 from isc.config import ccsession
 import isc.cc.proto_defs
 import isc.util.process
@@ -523,7 +524,17 @@ class SecureHTTPServer(socketserver_mixin.NoPollMixIn,
             logger.debug(DBG_CMDCTL_MESSAGING, CMDCTL_STARTED,
                          server_address[0], server_address[1])
         except socket.error as err:
-            raise CmdctlException("Error creating server, because: %s \n" % str(err))
+            if err.errno == errno.EADDRINUSE:
+                raise CmdctlException(("Error creating server, because " +\
+                                       "port %d on address %s is " +\
+                                       "already in use. Please stop " +\
+                                       "the application that uses it or " +\
+                                       "see the guide about using a " +\
+                                       "different port for b10-cmdctl.") % \
+                                      (server_address[1], \
+                                       server_address[0]))
+            else:
+                raise CmdctlException("Error creating server, because: %s" % str(err))
 
         self.user_sessions = {}
         self.idle_timeout = idle_timeout