From: JINMEI Tatuya <jinmei@isc.org>
Date: Thu, 16 May 2013 17:30:34 +0000 (-0700)
Subject: [master] (re)make sure to {un,}define USE_SHARED_MEMORY in config.h
X-Git-Tag: bind10-1.2.0beta1-release~459
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f8feaab9ff4bdfa54c61e4cdcc5e9216fab3c3c;p=thirdparty%2Fkea.git

[master] (re)make sure to {un,}define USE_SHARED_MEMORY in config.h

this chunk was accidentally removed in e448bbba3ecae68b261612954aa9777edc384be4
causing test faiulres.
---

diff --git a/configure.ac b/configure.ac
index 356d60fefb..af9a602612 100644
--- a/configure.ac
+++ b/configure.ac
@@ -891,6 +891,9 @@ if test X$use_shared_memory = Xyes -a "$BOOST_MAPPED_FILE_WOULDFAIL" = "yes"; th
     AC_MSG_ERROR([Boost shared memory does not compile on this system.  If you don't need it (most normal users won't) build without it by rerunning this script with --without-shared-memory; using a different compiler or a different version of Boost may also help.])
 fi
 AM_CONDITIONAL([USE_SHARED_MEMORY], [test x$use_shared_memory = xyes])
+if test "x$use_shared_memory" = "xyes"; then
+    AC_DEFINE(USE_SHARED_MEMORY, 1, [Define to 1 if shared memory support is enabled])
+fi
 AC_SUBST(BOOST_MAPPED_FILE_CXXFLAG)
 
 # Add some default CPP flags needed for Boost, identified by the AX macro.
diff --git a/src/bin/xfrout/xfrout.py.in b/src/bin/xfrout/xfrout.py.in
index 1863ad04be..ab6d091fbb 100755
--- a/src/bin/xfrout/xfrout.py.in
+++ b/src/bin/xfrout/xfrout.py.in
@@ -152,6 +152,14 @@ def get_soa_serial(soa_rdata):
     '''
     return Serial(int(soa_rdata.to_text().split()[2]))
 
+def make_blocking(fd, on=True):
+    flags = fcntl.fcntl(fd, fcntl.F_GETFL)
+    if on:                      # make it blocking
+        flags &= ~os.O_NONBLOCK
+    else:                       # make it non blocking
+        flags |= os.O_NONBLOCK
+    fcntl.fcntl(fd, fcntl.F_SETFL, flags)
+
 class XfroutSession():
     def __init__(self, sock_fd, request_data, server, tsig_key_ring, remote,
                  default_acl, zone_config, client_class=DataSourceClient):