update to 9.7.1-P2

[tridge/bind9.git] / bin / named / include / named / globals.h

diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index 6040dc30eb077cffdb62df07a16d70c9134c4370..6876adb6421955b29c2861930bd229976a3ff1c0 100644 (file)
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: globals.h,v 1.80 2008/11/16 22:49:18 marka Exp $ */
+/* $Id: globals.h,v 1.86.166.2 2010/06/26 23:46:40 tbox Exp $ */
 
 #ifndef NAMED_GLOBALS_H
 #define NAMED_GLOBALS_H 1
@@ -30,6 +30,8 @@
 
 #include <dns/zone.h>
 
+#include <dst/dst.h>
+
 #include <named/types.h>
 
 #undef EXTERN
@@ -86,8 +88,13 @@ EXTERN cfg_obj_t *           ns_g_config             INIT(NULL);
 EXTERN const cfg_obj_t *       ns_g_defaults           INIT(NULL);
 EXTERN const char *            ns_g_conffile           INIT(NS_SYSCONFDIR
                                                             "/named.conf");
+EXTERN cfg_obj_t *             ns_g_bindkeys           INIT(NULL);
 EXTERN const char *            ns_g_keyfile            INIT(NS_SYSCONFDIR
                                                             "/rndc.key");
+
+EXTERN dns_tsigkey_t *         ns_g_sessionkey         INIT(NULL);
+EXTERN dns_name_t              ns_g_sessionkeyname;
+
 EXTERN const char *            lwresd_g_conffile       INIT(NS_SYSCONFDIR
                                                             "/lwresd.conf");
 EXTERN const char *            lwresd_g_resolvconffile INIT("/etc"
@@ -112,6 +119,10 @@ EXTERN const char *                ns_g_chrootdir          INIT(NULL);
 EXTERN isc_boolean_t           ns_g_foreground         INIT(ISC_FALSE);
 EXTERN isc_boolean_t           ns_g_logstderr          INIT(ISC_FALSE);
 
+EXTERN const char *            ns_g_defaultsessionkeyfile
+                                       INIT(NS_LOCALSTATEDIR "/run/named/"
+                                                             "session.key");
+
 #if NS_RUN_PID_DIR
 EXTERN const char *            ns_g_defaultpidfile     INIT(NS_LOCALSTATEDIR
                                                             "/run/named/"
@@ -128,10 +139,17 @@ EXTERN const char *               lwresd_g_defaultpidfile INIT(NS_LOCALSTATEDIR
 
 EXTERN const char *            ns_g_username           INIT(NULL);
 
+#ifdef USE_PKCS11
+EXTERN const char *            ns_g_engine             INIT("pkcs11");
+#else
+EXTERN const char *            ns_g_engine             INIT(NULL);
+#endif
+
 EXTERN int                     ns_g_listen             INIT(3);
 EXTERN isc_time_t              ns_g_boottime;
 EXTERN isc_boolean_t           ns_g_memstatistics      INIT(ISC_FALSE);
 EXTERN isc_boolean_t           ns_g_clienttest         INIT(ISC_FALSE);
+EXTERN isc_boolean_t           ns_g_nosoa              INIT(ISC_FALSE);
 
 #undef EXTERN
 #undef INIT