Commit 5a9bc9bc authored by Mukund Sivaraman's avatar Mukund Sivaraman
Browse files

Merge branch 'master' into trac2360

parents 1114159c a5a98d2f
......@@ -12,6 +12,20 @@ AC_CONFIG_MACRO_DIR([m4macros])
# Checks for programs.
AC_PROG_CXX
# Enable low-performing debugging facilities? This option optionally
# enables some debugging aids that perform slowly and hence aren't built
# by default.
AC_ARG_ENABLE([debug],
AS_HELP_STRING([--enable-debug],
[enable debugging (default is no)]),
[case "${enableval}" in
yes) debug_enabled=yes ;;
no) debug_enabled=no ;;
*) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
esac],[debug_enabled=no])
AM_CONDITIONAL([DEBUG_ENABLED], [test x$debug_enabled = xyes])
AM_COND_IF([DEBUG_ENABLED], [AC_DEFINE([ENABLE_DEBUG], [1], [Enable low-performing debugging facilities?])])
# Libtool configuration
#
......@@ -203,6 +217,10 @@ case "$host" in
CPPFLAGS="$CPPFLAGS -D_XPG4_2 -D__EXTENSIONS__"
# "now" binding is necessary to prevent deadlocks in C++ static initialization code
LDFLAGS="$LDFLAGS -z now"
# Destroying locked mutexes, condition variables being waited
# on, etc. are undefined behavior on Solaris, so we set it as
# such here.
AC_DEFINE([HAS_UNDEFINED_PTHREAD_BEHAVIOR], [1], [Does this platform have some undefined pthreads behavior?])
;;
*-apple-darwin*)
# Starting with OSX 10.7 (Lion) we must choose which IPv6 API to use
......@@ -1112,6 +1130,7 @@ AC_CONFIG_FILES([Makefile
src/bin/bindctl/Makefile
src/bin/bindctl/tests/Makefile
src/bin/cfgmgr/Makefile
src/bin/cfgmgr/local_plugins/Makefile
src/bin/cfgmgr/plugins/Makefile
src/bin/cfgmgr/plugins/tests/Makefile
src/bin/cfgmgr/tests/Makefile
......@@ -1421,6 +1440,7 @@ Features:
$enable_features
Developer:
Enable Debugging: $debug_enabled
Google Tests: $enable_gtest
Valgrind: $found_valgrind
C++ Code Coverage: $USE_LCOV
......
......@@ -18,8 +18,8 @@
#include <cc/data.h>
#ifndef __CONFIG_H
#define __CONFIG_H 1
#ifndef CONFIG_H
#define CONFIG_H 1
class AuthSrv;
......@@ -195,7 +195,7 @@ void configureAuthServer(AuthSrv& server,
AuthConfigParser* createAuthConfigParser(AuthSrv& server,
const std::string& config_id);
#endif // __CONFIG_H
#endif // CONFIG_H
// Local Variables:
// mode: c++
......
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __AUTH_LOG__H
#define __AUTH_LOG__H
#ifndef AUTH_LOG_H
#define AUTH_LOG_H
#include <log/macros.h>
#include <auth/auth_messages.h>
......@@ -53,4 +53,4 @@ extern isc::log::Logger auth_logger;
} // namespace nsas
} // namespace isc
#endif // __AUTH_LOG__H
#endif // AUTH_LOG_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __AUTH_SRV_H
#define __AUTH_SRV_H 1
#ifndef AUTH_SRV_H
#define AUTH_SRV_H 1
#include <config/ccsession.h>
......@@ -328,7 +328,7 @@ private:
isc::asiodns::DNSServiceBase* dnss_;
};
#endif // __AUTH_SRV_H
#endif // AUTH_SRV_H
// Local Variables:
// mode: c++
......
......@@ -16,8 +16,8 @@
#include <cc/data.h>
#ifndef __COMMAND_H
#define __COMMAND_H 1
#ifndef COMMAND_H
#define COMMAND_H 1
class AuthSrv;
......@@ -54,7 +54,7 @@ isc::data::ConstElementPtr
execAuthServerCommand(AuthSrv& server, const std::string& command_id,
isc::data::ConstElementPtr args);
#endif // __COMMAND_H
#endif // COMMAND_H
// Local Variables:
// mode: c++
......
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __COMMON_H
#define __COMMON_H 1
#ifndef COMMON_H
#define COMMON_H 1
#include <stdexcept>
#include <string>
......@@ -62,7 +62,7 @@ extern const char* const AUTH_NAME;
/// This is sent to interested modules (currently only b10-ddns)
extern const char* const AUTH_STARTED_NOTIFICATION;
#endif // __COMMON_H
#endif // COMMON_H
// Local Variables:
// mode: c++
......
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef DATASRC_CONFIG_H
#define DATASRC_CONFIG_H
#ifndef AUTH_DATASRC_CONFIG_H
#define AUTH_DATASRC_CONFIG_H
#include <cc/data.h>
#include <datasrc/client_list.h>
......@@ -75,7 +75,7 @@ configureDataSourceGeneric(const isc::data::ConstElementPtr& config) {
isc::datasrc::ClientListMapPtr
configureDataSource(const isc::data::ConstElementPtr& config);
#endif // DATASRC_CONFIG_H
#endif // AUTH_DATASRC_CONFIG_H
// Local Variables:
// mode: c++
......
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __STATISTICS_H
#define __STATISTICS_H 1
#ifndef STATISTICS_H
#define STATISTICS_H 1
#include <dns/opcode.h>
#include <dns/rcode.h>
......@@ -178,7 +178,7 @@ public:
void registerStatisticsValidator(AuthCounters::validator_type validator) const;
};
#endif // __STATISTICS_H
#endif // STATISTICS_H
// Local Variables:
// mode: c++
......
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __AUTH_DATA_SOURCE_UTIL_H
#define __AUTH_DATA_SOURCE_UTIL_H 1
#ifndef AUTH_DATA_SOURCE_UTIL_H
#define AUTH_DATA_SOURCE_UTIL_H 1
#include <dns/name.h>
#include <dns/rrclass.h>
......@@ -51,7 +51,7 @@ createSQLite3DB(dns::RRClass zclass, const dns::Name& zname,
} // end of auth
} // end of isc
#endif // __AUTH_DATA_SOURCE_UTIL_H
#endif // AUTH_DATA_SOURCE_UTIL_H
// Local Variables:
// mode: c++
......
SUBDIRS = . plugins tests
SUBDIRS = . plugins local_plugins tests
pkglibexecdir = $(libexecdir)/@PACKAGE@
......
# Nothing is installed from this directory. This local_plugins
# directory overrides the plugins directory when lettuce is run, and the
# spec file here is used to serve the static zone from the source tree
# for testing (instead of installation prefix).
noinst_DATA = datasrc.spec
datasrc.spec: ../plugins/datasrc.spec.pre
$(SED) -e "s|@@STATIC_ZONE_FILE@@|$(abs_top_builddir)/src/lib/datasrc/static.zone|;s|@@SQLITE3_DATABASE_FILE@@|$(abs_top_builddir)/local.zone.sqlite3|" ../plugins/datasrc.spec.pre >$@
CLEANFILES = datasrc.spec
......@@ -3,7 +3,7 @@ SUBDIRS = tests
EXTRA_DIST = README logging.spec tsig_keys.spec
datasrc.spec: datasrc.spec.pre
$(SED) -e "s|@@PKGDATADIR@@|$(pkgdatadir)|;s|@@LOCALSTATEDIR@@|$(localstatedir)|" datasrc.spec.pre >$@
$(SED) -e "s|@@STATIC_ZONE_FILE@@|$(pkgdatadir)/static.zone|;s|@@SQLITE3_DATABASE_FILE@@|$(localstatedir)/$(PACKAGE)/zone.sqlite3|" datasrc.spec.pre >$@
config_plugindir = @prefix@/share/@PACKAGE@/config_plugins
config_plugin_DATA = logging.spec tsig_keys.spec datasrc.spec
......
......@@ -12,7 +12,7 @@
{
"type": "sqlite3",
"params": {
"database_file": "@@LOCALSTATEDIR@@/@PACKAGE@/zone.sqlite3"
"database_file": "@@SQLITE3_DATABASE_FILE@@"
}
}
],
......@@ -20,7 +20,7 @@
{
"type": "static",
"cache-enable": false,
"params": "@@PKGDATADIR@@/static.zone"
"params": "@@STATIC_ZONE_FILE@@"
}
]
},
......
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __DHCP4_LOG__H
#define __DHCP4_LOG__H
#ifndef DHCP4_LOG_H
#define DHCP4_LOG_H
#include <log/macros.h>
#include <log/logger_support.h>
......@@ -56,4 +56,4 @@ extern isc::log::Logger dhcp4_logger;
} // namespace dhcp4
} // namespace isc
#endif // __DHCP4_LOG__H
#endif // DHCP4_LOG_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __DHCP6_LOG__H
#define __DHCP6_LOG__H
#ifndef DHCP6_LOG_H
#define DHCP6_LOG_H
#include <log/macros.h>
#include <log/logger_support.h>
......@@ -56,4 +56,4 @@ extern isc::log::Logger dhcp6_logger;
} // namespace dhcp6
} // namespace isc
#endif // __DHCP6_LOG__H
#endif // DHCP6_LOG_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __RESOLVER_H
#define __RESOLVER_H 1
#ifndef RESOLVER_H
#define RESOLVER_H 1
#include <string>
#include <vector>
......@@ -266,7 +266,7 @@ private:
isc::cache::ResolverCache* cache_;
};
#endif // __RESOLVER_H
#endif // RESOLVER_H
// Local Variables:
// mode: c++
......
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __RESOLVER_LOG__H
#define __RESOLVER_LOG__H
#ifndef RESOLVER_LOG_H
#define RESOLVER_LOG_H
#include <log/macros.h>
#include "resolver_messages.h"
......@@ -46,4 +46,4 @@ const int RESOLVER_DBG_DETAIL = DBGLVL_TRACE_DETAIL_DATA;
/// space.
extern isc::log::Logger resolver_logger;
#endif // __RESOLVER_LOG__H
#endif // RESOLVER_LOG_H
......@@ -14,8 +14,8 @@
// $Id$
#ifndef __RESPONSE_SCRUBBER_H
#define __RESPONSE_SCRUBBER_H
#ifndef RESPONSE_SCRUBBER_H
#define RESPONSE_SCRUBBER_H
/// \page DataScrubbing Data Scrubbing
/// \section DataScrubbingIntro Introduction
......@@ -419,4 +419,4 @@ public:
}
};
#endif // __RESPONSE_SCRUBBER_H
#endif // RESPONSE_SCRUBBER_H
......@@ -18,8 +18,8 @@
/// This module holds the functionality of the socket creator. It is a separate
/// module from main to make testing easier.
#ifndef __SOCKCREATOR_H
#define __SOCKCREATOR_H 1
#ifndef SOCKCREATOR_H
#define SOCKCREATOR_H 1
#include <util/io/fd_share.h>
#include <exceptions/exceptions.h>
......@@ -144,4 +144,4 @@ run(const int input_fd, const int output_fd, get_sock_t get_sock_fun,
} // namespace socket_creator
} // NAMESPACE ISC
#endif // __SOCKCREATOR_H
#endif // SOCKCREATOR_H
......@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
#ifndef __DNSNAME_CHECK_H
#define __DNSNAME_CHECK_H 1
#ifndef DNSNAME_CHECK_H
#define DNSNAME_CHECK_H 1
#include <dns/name.h>
......@@ -76,7 +76,7 @@ private:
} // namespace acl
} // namespace isc
#endif // __DNSNAME_CHECK_H
#endif // DNSNAME_CHECK_H
// Local Variables:
// mode: c++
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment