BIND 10 master, updated. cc7b41e7ce61e745602748346c4b00b8b864bdef [master] Merge branch 'trac680'

[BIND 10 source code commits]

The branch, master has been updated
       via  cc7b41e7ce61e745602748346c4b00b8b864bdef (commit)
       via  ac0eaa438f7b76f1f58d54070313e9ffc5417c26 (commit)
       via  76c52a9395ff0b7bcd9b911308d43da8171a7cd5 (commit)
      from  ccf170eee20359d3661fc70a7ce02b965cc90a69 (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 cc7b41e7ce61e745602748346c4b00b8b864bdef
Merge: ccf170e ac0eaa4
Author: Jelte Jansen <jelte at isc.org>
Date:   Mon Jan 14 17:19:19 2013 +0100

    [master] Merge branch 'trac680'

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

Summary of changes:
 src/bin/bindctl/bindcmd.py |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/bindctl/bindcmd.py b/src/bin/bindctl/bindcmd.py
index 37b74e7..7c2b2af 100644
--- a/src/bin/bindctl/bindcmd.py
+++ b/src/bin/bindctl/bindcmd.py
@@ -208,12 +208,13 @@ WARNING: Python readline module isn't available, so the command line editor
         return True
 
     def login_to_cmdctl(self):
-        '''Login to cmdctl with the username and password inputted
-        from user. After the login is sucessful, the username and
+        '''Login to cmdctl with the username and password given by
+        the user. After the login is sucessful, the username and
         password will be saved in 'default_user.csv', when run the next
         time, username and password saved in 'default_user.csv' will be
         used first.
         '''
+        # Look at existing username/password combinations and try to log in
         users = self._get_saved_user_info(self.csv_file_dir, CSV_FILE_NAME)
         for row in users:
             param = {'username': row[0], 'password' : row[1]}
@@ -230,15 +231,18 @@ WARNING: Python readline module isn't available, so the command line editor
                     print(data + ' login as ' + row[0])
                 return True
 
+        # No valid logins were found, prompt the user for a username/password
         count = 0
-        print("[TEMP MESSAGE]: username :root  password :bind10")
+        print('No stored password file found, please see sections '
+              '"Configuration specification for b10-cmdctl" and "bindctl '
+              'command-line options" of the BIND 10 guide.')
         while True:
             count = count + 1
             if count > 3:
                 print("Too many authentication failures")
                 return False
 
-            username = input("Username:")
+            username = input("Username: ")
             passwd = getpass.getpass()
             param = {'username': username, 'password' : passwd}
             try: