[svn] commit: r2103 - in /trunk: ChangeLog src/bin/auth/asio_link.cc src/bin/xfrout/xfrout.py.in

[BIND 10 source code commits]

Author: zhanglikun
Date: Thu Jun 10 02:13:18 2010
New Revision: 2103

Log:
Enable b10-xfrout can be launched in source code tree.(Reviewed by Jelte)

Modified:
    trunk/ChangeLog
    trunk/src/bin/auth/asio_link.cc
    trunk/src/bin/xfrout/xfrout.py.in

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Thu Jun 10 02:13:18 2010
@@ -1,3 +1,8 @@
+  54.   [bug]      zhanglikun
+	bin/xfrout: Enable b10-xfrout can be launched in source
+	code tree.
+	(Trac #224, svn r2103)
+
   53.   [bug]      zhanglikun
 	bin/bindctl: Generate a unique session ID by using 
 	socket.gethostname() instead of socket.gethostbyname(), 

Modified: trunk/src/bin/auth/asio_link.cc
==============================================================================
--- trunk/src/bin/auth/asio_link.cc (original)
+++ trunk/src/bin/auth/asio_link.cc Thu Jun 10 02:13:18 2010
@@ -68,7 +68,13 @@
 dispatch_axfr_query(const int tcp_sock, char const axfr_query[],
                     const uint16_t query_len)
 {
-    string path(UNIX_SOCKET_FILE);
+    string path;
+    if (getenv("B10_FROM_BUILD")) {
+        path = string(getenv("B10_FROM_BUILD")) + "/auth_xfrout_conn";
+    } else {
+        path = UNIX_SOCKET_FILE;
+    }
+    
     XfroutClient xfr_client(path);
     try {
         xfr_client.connect();

Modified: trunk/src/bin/xfrout/xfrout.py.in
==============================================================================
--- trunk/src/bin/xfrout/xfrout.py.in (original)
+++ trunk/src/bin/xfrout/xfrout.py.in Thu Jun 10 02:13:18 2010
@@ -40,13 +40,14 @@
 
 if "B10_FROM_BUILD" in os.environ:
     SPECFILE_PATH = os.environ["B10_FROM_BUILD"] + "/src/bin/xfrout"
+    UNIX_SOCKET_FILE= os.environ["B10_FROM_BUILD"] + "/auth_xfrout_conn"
 else:
     PREFIX = "@prefix@"
     DATAROOTDIR = "@datarootdir@"
     SPECFILE_PATH = "@datadir@/@PACKAGE@".replace("${datarootdir}", DATAROOTDIR).replace("${prefix}", PREFIX)
+    UNIX_SOCKET_FILE = "@@LOCALSTATEDIR@@/auth_xfrout_conn"
+
 SPECFILE_LOCATION = SPECFILE_PATH + "/xfrout.spec"
-UNIX_SOCKET_FILE = "@@LOCALSTATEDIR@@/auth_xfrout_conn"
-
 MAX_TRANSFERS_OUT = 10
 verbose_mode = False