[svn] commit: r608 - in /branches/parkinglot: ./ src/bin/bindctl/ src/bin/bindctl/unittest/ src/bin/cmdctl/

[BIND 10 source code commits]

Author: zhanglikun
Date: Thu Jan 28 23:47:18 2010
New Revision: 608

Log:
Move files from /src/lib/bindctl to /src/bin/bindctl.

Added:
    branches/parkinglot/src/bin/bindctl/README
    branches/parkinglot/src/bin/bindctl/__init__.py
    branches/parkinglot/src/bin/bindctl/bindcmd.py
    branches/parkinglot/src/bin/bindctl/bindctl.pem
      - copied unchanged from r605, branches/parkinglot/src/bin/bindctl/create_your_cert.pem
    branches/parkinglot/src/bin/bindctl/cmdparse.py
    branches/parkinglot/src/bin/bindctl/exception.py
    branches/parkinglot/src/bin/bindctl/moduleinfo.py
    branches/parkinglot/src/bin/bindctl/mycollections.py
    branches/parkinglot/src/bin/bindctl/unittest/
    branches/parkinglot/src/bin/cmdctl/b10-cmdctl.pem
      - copied unchanged from r605, branches/parkinglot/src/bin/cmdctl/create_your_cert.pem
Removed:
    branches/parkinglot/src/bin/bindctl/create_your_cert.pem
    branches/parkinglot/src/bin/cmdctl/create_your_cert.pem
Modified:
    branches/parkinglot/configure.ac
    branches/parkinglot/src/bin/bindctl/bindctl.in
    branches/parkinglot/src/bin/cmdctl/b10-cmdctl.py

Modified: branches/parkinglot/configure.ac
==============================================================================
--- branches/parkinglot/configure.ac (original)
+++ branches/parkinglot/configure.ac Thu Jan 28 23:47:18 2010
@@ -169,6 +169,7 @@
            src/bin/bind10/bind10
            src/bin/bind10/bind10_test
            src/bin/bindctl/bindctl
+           src/bin/bindctl/unittest/bindctl_test
            src/bin/msgq/msgq
            src/bin/msgq/msgq_test
            src/bin/parkinglot/config.h

Modified: branches/parkinglot/src/bin/bindctl/bindctl.in
==============================================================================
--- branches/parkinglot/src/bin/bindctl/bindctl.in (original)
+++ branches/parkinglot/src/bin/bindctl/bindctl.in Thu Jan 28 23:47:18 2010
@@ -5,7 +5,7 @@
 
 BINDCTL_PATH=@abs_top_srcdir@/src/bin/bindctl
 
-PYTHONPATH=@abs_top_srcdir@/src/lib/cc/python:@abs_top_srcdir@/src/lib/bindctl/
+PYTHONPATH=@abs_top_srcdir@/src/lib/cc/python
 export PYTHONPATH
 
 cd ${BINDCTL_PATH}

Modified: branches/parkinglot/src/bin/cmdctl/b10-cmdctl.py
==============================================================================
--- branches/parkinglot/src/bin/cmdctl/b10-cmdctl.py (original)
+++ branches/parkinglot/src/bin/cmdctl/b10-cmdctl.py Thu Jan 28 23:47:18 2010
@@ -202,8 +202,8 @@
         try:
             connstream = ssl.wrap_socket(newsocket,
                                      server_side = True,
-                                     certfile = 'create_your_cert.pem',
-                                     keyfile = 'create_your_cert.pem',
+                                     certfile = 'b10-cmdctl.pem',
+                                     keyfile = 'b10-cmdctl.pem',
                                      ssl_version = ssl.PROTOCOL_SSLv23)
             return (connstream, fromaddr)
         except ssl.SSLError as e :