[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r3758 - in branches/OpenDNSSEC-sion/enforcer: . common enforcerd ksm test test/cucumber test/cucumber/features test/cucumber/features/step_definitions test/cucumber/features/support utils

Sion Lloyd sion at nominet.org.uk
Fri Aug 13 15:45:30 CEST 2010


Author: sion
Date: 2010-08-13 15:45:30 +0200 (Fri, 13 Aug 2010)
New Revision: 3758

Added:
   branches/OpenDNSSEC-sion/enforcer/test/cucumber/
   branches/OpenDNSSEC-sion/enforcer/test/database_setup_mysql.sh.in
   branches/OpenDNSSEC-sion/enforcer/test/database_setup_sqlite3.sh.in
Removed:
   branches/OpenDNSSEC-sion/enforcer/configure.ac
   branches/OpenDNSSEC-sion/enforcer/ksm/compat/
   branches/OpenDNSSEC-sion/enforcer/m4/
   branches/OpenDNSSEC-sion/enforcer/test/database_setup.sh
   branches/OpenDNSSEC-sion/enforcer/test/database_setup_lite.sh
Modified:
   branches/OpenDNSSEC-sion/enforcer/Makefile.am
   branches/OpenDNSSEC-sion/enforcer/common/Makefile.am
   branches/OpenDNSSEC-sion/enforcer/common/daemon.c
   branches/OpenDNSSEC-sion/enforcer/common/daemon_util.c
   branches/OpenDNSSEC-sion/enforcer/enforcerd/Makefile.am
   branches/OpenDNSSEC-sion/enforcer/enforcerd/enforcer.c
   branches/OpenDNSSEC-sion/enforcer/ksm/Makefile.am
   branches/OpenDNSSEC-sion/enforcer/ksm/datetime.c
   branches/OpenDNSSEC-sion/enforcer/ksm/string_util.c
   branches/OpenDNSSEC-sion/enforcer/test/Makefile.am
   branches/OpenDNSSEC-sion/enforcer/test/cucumber/features/
   branches/OpenDNSSEC-sion/enforcer/test/cucumber/features/step_definitions/
   branches/OpenDNSSEC-sion/enforcer/test/cucumber/features/support/
   branches/OpenDNSSEC-sion/enforcer/test/test_routines.c
   branches/OpenDNSSEC-sion/enforcer/test/test_routines_database.c
   branches/OpenDNSSEC-sion/enforcer/utils/Makefile.am
   branches/OpenDNSSEC-sion/enforcer/utils/ksmutil.c
   branches/OpenDNSSEC-sion/enforcer/utils/ods-ksmutil.1.in
Log:
merge in changes from trunk up to r3757


Modified: branches/OpenDNSSEC-sion/enforcer/Makefile.am
===================================================================
--- branches/OpenDNSSEC-sion/enforcer/Makefile.am	2010-08-13 11:26:46 UTC (rev 3757)
+++ branches/OpenDNSSEC-sion/enforcer/Makefile.am	2010-08-13 13:45:30 UTC (rev 3758)
@@ -1,18 +1,13 @@
 # $Id: Makefile.am 615 2009-05-06 08:52:03Z jakob $
 
-ACLOCAL_AMFLAGS = -I m4
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
-MAINTAINERCLEANFILES = \
-	config.log config.status \
-	$(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(srcdir)/config.h.in~ \
-	$(srcdir)/configure \
-	$(srcdir)/install-sh $(srcdir)/ltmain.sh $(srcdir)/missing \
-	$(srcdir)/depcomp $(srcdir)/aclocal.m4 $(srcdir)/compile \
-	$(srcdir)/config.guess $(srcdir)/config.sub
-
 SUBDIRS = ksm common enforcerd utils test
 
-install-data-hook:
-	mkdir -p ${DESTDIR}$(localstatedir)/run/opendnssec
-	mkdir -p ${DESTDIR}$(localstatedir)/opendnssec
+doxygen:
+	rm -fr $(top_builddir)/enforcer/doxygen-doc
+	env $(DX_ENV) \
+		PROJECT_NAME="OpenDNSSEC-enforcer" \
+		SRCDIR=$(top_srcdir)/enforcer \
+		OUTPUTDIR=$(top_builddir)/enforcer/doxygen-doc \
+		$(DX_DOXYGEN) $(top_builddir)/$(DX_CONFIG)

Modified: branches/OpenDNSSEC-sion/enforcer/common/Makefile.am
===================================================================
--- branches/OpenDNSSEC-sion/enforcer/common/Makefile.am	2010-08-13 11:26:46 UTC (rev 3757)
+++ branches/OpenDNSSEC-sion/enforcer/common/Makefile.am	2010-08-13 13:45:30 UTC (rev 3758)
@@ -3,14 +3,18 @@
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/common \
+	-I$(top_builddir)/common \
 	-I$(srcdir)/../ksm/include \
 	-I$(builddir)/../ksm/include \
-	@LIBHSM_INCLUDES@ \
+	-I$(srcdir)/../../libhsm/src \
+	-I$(builddir)/../../libhsm/src \
 	@XML2_INCLUDES@ \
-    @DB_INCLUDES@
+	@DB_INCLUDES@
 
 noinst_LIBRARIES = libenforcer.a
 
-libenforcer_a_SOURCES = daemon.c daemon_util.c kaspaccess.c privdrop.c
-
-EXTRA_DIST = $(srcdir)/*.h
+libenforcer_a_SOURCES = daemon.c daemon.h \
+	daemon_util.c daemon_util.h \
+	kaspaccess.c kaspaccess.h \
+	privdrop.c privdrop.h

Modified: branches/OpenDNSSEC-sion/enforcer/common/daemon.c
===================================================================
--- branches/OpenDNSSEC-sion/enforcer/common/daemon.c	2010-08-13 11:26:46 UTC (rev 3757)
+++ branches/OpenDNSSEC-sion/enforcer/common/daemon.c	2010-08-13 13:45:30 UTC (rev 3758)
@@ -38,6 +38,8 @@
  * Most of this is based on stuff I have seen in NSD
  */
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <syslog.h>

Modified: branches/OpenDNSSEC-sion/enforcer/common/daemon_util.c
===================================================================
--- branches/OpenDNSSEC-sion/enforcer/common/daemon_util.c	2010-08-13 11:26:46 UTC (rev 3757)
+++ branches/OpenDNSSEC-sion/enforcer/common/daemon_util.c	2010-08-13 13:45:30 UTC (rev 3758)
@@ -37,7 +37,11 @@
  *
  * Most of this is based on stuff I have seen in NSD
  */
+#include "config.h"
+
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -60,7 +64,6 @@
 #include <libxml/xpathInternals.h>
 #include <libxml/relaxng.h>
 
-#include "config.h"
 #include "daemon.h"
 #include "daemon_util.h"
 
@@ -85,7 +88,7 @@
     xmlChar *group_expr = (unsigned char*) "//Configuration/Enforcer/Privileges/Group";
 
     char* filename = NULL;
-    char* rngfilename = SCHEMA_DIR "/conf.rng";
+    char* rngfilename = OPENDNSSEC_SCHEMA_DIR "/conf.rng";
     char* temp_char = NULL;
 
     struct passwd *pwd;
@@ -96,7 +99,7 @@
     if (config->configfile != NULL) {
         filename = StrStrdup(config->configfile);
     } else {
-        filename = StrStrdup(CONFIG_FILE);
+        filename = StrStrdup(OPENDNSSEC_CONFIG_FILE);
     }
 
     /* Load XML document */
@@ -582,7 +585,7 @@
     int status;
     int db_found = 0;
     char* filename = NULL;
-    char* rngfilename = SCHEMA_DIR "/conf.rng";
+    char* rngfilename = OPENDNSSEC_SCHEMA_DIR "/conf.rng";
 
     char* temp_char = NULL;
 
@@ -592,7 +595,7 @@
     if (config->configfile != NULL) {
         filename = StrStrdup(config->configfile);
     } else {
-        filename = StrStrdup(CONFIG_FILE);
+        filename = StrStrdup(OPENDNSSEC_CONFIG_FILE);
     }
 
     if (verbose) {

Modified: branches/OpenDNSSEC-sion/enforcer/enforcerd/Makefile.am
===================================================================
--- branches/OpenDNSSEC-sion/enforcer/enforcerd/Makefile.am	2010-08-13 11:26:46 UTC (rev 3757)
+++ branches/OpenDNSSEC-sion/enforcer/enforcerd/Makefile.am	2010-08-13 13:45:30 UTC (rev 3758)
@@ -2,12 +2,20 @@
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
+LIBHSM = ${top_builddir}/libhsm/src/libhsm.a
+LIBKSM = ../ksm/libksm.a
+LIBENFORCER = ../common/libenforcer.a
+LIBCOMPAT = ${top_builddir}/common/libcompat.a
+
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/common \
+	-I$(top_builddir)/common \
 	-I$(srcdir)/../common \
 	-I$(builddir)/../common \
 	-I$(srcdir)/../ksm/include \
 	-I$(builddir)/../ksm/include \
-	@LIBHSM_INCLUDES@ \
+	-I$(srcdir)/../../libhsm/src \
+	-I$(builddir)/../../libhsm/src \
 	@XML2_INCLUDES@ \
 	@DB_INCLUDES@ \
 	@LDNS_INCLUDES@
@@ -15,12 +23,6 @@
 sbin_PROGRAMS = ods-enforcerd
 man8_MANS = ods-enforcerd.8
 
-ods_enforcerd_SOURCES = enforcer.c
-ods_enforcerd_LDADD = ../common/libenforcer.a ../ksm/libksm.a
-ods_enforcerd_LDADD += @LIBHSM_LIBS@ @XML2_LIBS@ @DB_LIBS@
-ods_enforcerd_DEPENDENCIES = @BUILD_LIBHSM@
-
-EXTRA_DIST = $(srcdir)/*.h
-
-../../libhsm/src/libhsm.la:
-	(cd ../../libhsm/src; ${MAKE} libhsm.la)
+ods_enforcerd_SOURCES = enforcer.c enforcer.h
+ods_enforcerd_LDADD = $(LIBENFORCER) $(LIBKSM) $(LIBHSM) $(LIBCOMPAT)
+ods_enforcerd_LDADD += @XML2_LIBS@ @DB_LIBS@ @LDNS_LIBS@

Modified: branches/OpenDNSSEC-sion/enforcer/enforcerd/enforcer.c
===================================================================
--- branches/OpenDNSSEC-sion/enforcer/enforcerd/enforcer.c	2010-08-13 11:26:46 UTC (rev 3757)
+++ branches/OpenDNSSEC-sion/enforcer/enforcerd/enforcer.c	2010-08-13 13:45:30 UTC (rev 3758)
@@ -69,7 +69,7 @@
 
     /* set the default pidfile if nothing was provided on the command line*/
     if (config->pidfile == NULL) {
-        config->pidfile = ENFORCER_PIDFILE;
+        config->pidfile = OPENDNSSEC_ENFORCER_PIDFILE;
     }
 
     return 0;
@@ -120,7 +120,7 @@
         if (config->configfile != NULL) {
             result = hsm_open(config->configfile, hsm_prompt_pin, NULL);
         } else {
-            result = hsm_open(CONFIG_FILE, hsm_prompt_pin, NULL);
+            result = hsm_open(OPENDNSSEC_CONFIG_FILE, hsm_prompt_pin, NULL);
         }
         if (result) {
             hsm_error_message = hsm_get_error(ctx);
@@ -570,7 +570,7 @@
     if (config->configfile != NULL) {
         status = read_zonelist_filename(config->configfile, &zonelist_filename);
     } else {
-        status = read_zonelist_filename(CONFIG_FILE, &zonelist_filename);
+        status = read_zonelist_filename(OPENDNSSEC_CONFIG_FILE, &zonelist_filename);
     }
     
     if (status != 0) {

Modified: branches/OpenDNSSEC-sion/enforcer/ksm/Makefile.am
===================================================================
--- branches/OpenDNSSEC-sion/enforcer/ksm/Makefile.am	2010-08-13 11:26:46 UTC (rev 3757)
+++ branches/OpenDNSSEC-sion/enforcer/ksm/Makefile.am	2010-08-13 13:45:30 UTC (rev 3758)
@@ -5,6 +5,8 @@
 SUBDIRS = include
 
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/common \
+	-I$(top_builddir)/common \
 	-I$(srcdir)/include \
 	-I$(builddir)/include \
 	@DB_INCLUDES@ \
@@ -18,8 +20,7 @@
 	ksm_key.c ksm_key_delete.c ksm_keyword.c ksm_list.c ksm_parameter.c \
 	ksm_parameter_value.c ksm_policy.c ksm_policy_value.c ksm_purge.c \
 	ksm_request.c ksm_time.c ksm_update.c ksm_version.c ksm_zone.c \
-	memory.c message.c string_util.c string_util2.c \
-	compat/strlcpy.c compat/strlcat.c
+	memory.c message.c string_util.c string_util2.c
 
 if USE_MYSQL
 libksm_a_SOURCES += \

Modified: branches/OpenDNSSEC-sion/enforcer/ksm/datetime.c
===================================================================
--- branches/OpenDNSSEC-sion/enforcer/ksm/datetime.c	2010-08-13 11:26:46 UTC (rev 3757)
+++ branches/OpenDNSSEC-sion/enforcer/ksm/datetime.c	2010-08-13 13:45:30 UTC (rev 3758)
@@ -34,6 +34,8 @@
 -*/
 
 #define _GNU_SOURCE /* glibc2 needs this */
+#include "config.h"
+
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -41,7 +43,7 @@
 #include <time.h>
 #include <limits.h>
 
-#include "config.h"
+#include "compat.h"
 
 #include "ksm/ksm.h"
 #include "ksm/datetime.h"

Modified: branches/OpenDNSSEC-sion/enforcer/ksm/string_util.c
===================================================================
--- branches/OpenDNSSEC-sion/enforcer/ksm/string_util.c	2010-08-13 11:26:46 UTC (rev 3757)
+++ branches/OpenDNSSEC-sion/enforcer/ksm/string_util.c	2010-08-13 13:45:30 UTC (rev 3758)
@@ -33,13 +33,15 @@
  *      String utility functions used by the whois programs.
 -*/
 
+#include "config.h"
+
 #include <assert.h>
 #include <ctype.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "config.h"
+#include "compat.h"
 
 #include "ksm/string_util.h"
 #include "ksm/message.h"

Modified: branches/OpenDNSSEC-sion/enforcer/test/Makefile.am
===================================================================
--- branches/OpenDNSSEC-sion/enforcer/test/Makefile.am	2010-08-13 11:26:46 UTC (rev 3757)
+++ branches/OpenDNSSEC-sion/enforcer/test/Makefile.am	2010-08-13 13:45:30 UTC (rev 3758)
@@ -2,7 +2,12 @@
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
+LIBHSM = ${top_builddir}/libhsm/src/libhsm.a
+LIBCOMPAT = ${top_builddir}/common/libcompat.a
+
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/common \
+	-I$(top_builddir)/common \
 	-I$(srcdir)/../ksm/include \
 	-I$(builddir)/../ksm/include \
 	@CUNIT_INCLUDES@ \
@@ -15,7 +20,8 @@
 	test_di_string.c test_dq_string.c test_du_string.c test_keyword.c \
 	test_ksm_key.c test_ksm_key_delete.c test_ksm_parameter.c \
 	test_ksm_policy.c test_ksm_purge.c test_ksm_request.c \
-	test_ksm_update.c test_ksm_zone.c test_message.c test_routines.c \
+	test_ksm_update.c test_ksm_zone.c test_message.c \
+	test_routines.c test_routines.h \
 	test_routines_cunit.c test_routines_database.c test_string_util.c \
 	test_string_util2.c test_ksm_import.c
 	
@@ -27,7 +33,5 @@
 
 TESTS = test
 
-test_LDADD = ../ksm/libksm.a -lncurses @CUNIT_LIBS@ @DB_LIBS@ @LIBHSM_LIBS@
+test_LDADD = ../ksm/libksm.a @CUNIT_LIBS@ @DB_LIBS@ $(LIBHSM) $(LIBCOMPAT)
 test_LDFLAGS = -no-install
-
-EXTRA_DIST = $(srcdir)/*.h


Property changes on: branches/OpenDNSSEC-sion/enforcer/test/cucumber
___________________________________________________________________
Added: svn:ignore
   + Makefile
Makefile.in
core
acinclude.m4
aclocal.m4
autom4te.cache
compile
py-compile
confdefs.h
config.*
configure
conftest
conftest.c
depcomp
install-sh
libtool
libtool.m4
lt*.m4
ltmain.sh
missing
mkinstalldirs
stamp-h*
obj

.deps
.libs
.#*#
.*.bak
.*.orig
.*.rej
.*~
#*#
*.bak
*.la
*.lib
*.lo
*.orig
*.rej
*~
*.gz
*.bz2
*.[0-9]
*.out


Modified: branches/OpenDNSSEC-sion/enforcer/test/test_routines.c
===================================================================
--- branches/OpenDNSSEC-sion/enforcer/test/test_routines.c	2010-08-13 11:26:46 UTC (rev 3757)
+++ branches/OpenDNSSEC-sion/enforcer/test/test_routines.c	2010-08-13 13:45:30 UTC (rev 3758)
@@ -36,6 +36,8 @@
  *      available from http://cunit.sourcefourge.net.
 -*/
 
+#include "config.h"
+
 #include <assert.h>
 #include <string.h>
 #include <strings.h>

Modified: branches/OpenDNSSEC-sion/enforcer/test/test_routines_database.c
===================================================================
--- branches/OpenDNSSEC-sion/enforcer/test/test_routines_database.c	2010-08-13 11:26:46 UTC (rev 3757)
+++ branches/OpenDNSSEC-sion/enforcer/test/test_routines_database.c	2010-08-13 13:45:30 UTC (rev 3758)
@@ -112,9 +112,9 @@
 	int			status;		/* Status return from connection */
 
 #ifdef USE_MYSQL
-	(void) system("sh ./database_setup.sh setup");
+	(void) system("sh ./database_setup_mysql.sh setup");
 #else
-	(void) system("sh ./database_setup_lite.sh setup");
+	(void) system("sh ./database_setup_sqlite3.sh setup");
 #endif
 
 	DbInit();
@@ -134,9 +134,9 @@
 	DbRundown();
 
 #ifdef USE_MYSQL
-	(void) system("sh ./database_setup.sh teardown");
+	(void) system("sh ./database_setup_mysql.sh teardown");
 #else
-	(void) system("sh ./database_setup_lite.sh teardown");
+	(void) system("sh ./database_setup_sqlite3.sh teardown");
 #endif
 
 	return 0;

Modified: branches/OpenDNSSEC-sion/enforcer/utils/Makefile.am
===================================================================
--- branches/OpenDNSSEC-sion/enforcer/utils/Makefile.am	2010-08-13 11:26:46 UTC (rev 3757)
+++ branches/OpenDNSSEC-sion/enforcer/utils/Makefile.am	2010-08-13 13:45:30 UTC (rev 3758)
@@ -2,18 +2,23 @@
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 
+LIBHSM = ${top_builddir}/libhsm/src/libhsm.a
+LIBKSM = ../ksm/libksm.a
+LIBCOMPAT = ${top_builddir}/common/libcompat.a
+
 AM_CPPFLAGS = \
+	-I$(top_srcdir)/common \
+	-I$(top_builddir)/common \
 	-I$(srcdir)/../common \
 	-I$(builddir)/../common \
 	-I$(srcdir)/../ksm/include \
 	-I$(builddir)/../ksm/include \
-	@LIBHSM_INCLUDES@ \
+	-I$(srcdir)/../../libhsm/src \
+	-I$(builddir)/../../libhsm/src \
 	@XML2_INCLUDES@ \
 	@DB_INCLUDES@ \
 	@LDNS_INCLUDES@
 
-AM_CFLAGS = -std=c99
-
 opendnssecdatadir = $(datadir)/opendnssec
 
 if USE_MYSQL
@@ -26,12 +31,5 @@
 man1_MANS =	ods-ksmutil.1
 
 ods_ksmutil_SOURCES = ksmutil.c
-ods_ksmutil_LDADD = ../ksm/libksm.a
-ods_ksmutil_LDADD += @XML2_LIBS@ @DB_LIBS@ @LIBHSM_LIBS@ @LDNS_LIBS@
-ods_ksmutil_DEPENDENCIES = @BUILD_LIBHSM@
-
-../../libhsm/src/libhsm.la:
-	(cd ../../libhsm/src; ${MAKE} libhsm.la)
-
-../ksm/libksm.a:
-	(cd ../ksm; ${MAKE} libksm.a)
+ods_ksmutil_LDADD = $(LIBKSM) $(LIBHSM) $(LIBCOMPAT)
+ods_ksmutil_LDADD += @XML2_LIBS@ @DB_LIBS@ @LDNS_LIBS@

Modified: branches/OpenDNSSEC-sion/enforcer/utils/ksmutil.c
===================================================================
--- branches/OpenDNSSEC-sion/enforcer/utils/ksmutil.c	2010-08-13 11:26:46 UTC (rev 3757)
+++ branches/OpenDNSSEC-sion/enforcer/utils/ksmutil.c	2010-08-13 13:45:30 UTC (rev 3758)
@@ -83,7 +83,7 @@
 extern char *optarg;
 extern int optind;
 const char *progname = NULL;
-char *config = (char *) CONFIG_FILE;
+char *config = (char *) OPENDNSSEC_CONFIG_FILE;
 
 char *o_keystate = NULL;
 char *o_algo = NULL;
@@ -765,7 +765,7 @@
      * (sort of, not the neatest output)
      */
     if (o_signerconf == NULL) {
-        StrAppend(&sig_conf_name, LOCALSTATE_DIR);
+        StrAppend(&sig_conf_name, OPENDNSSEC_STATE_DIR);
         StrAppend(&sig_conf_name, "/signconf/");
         StrAppend(&sig_conf_name, o_zone);
         StrAppend(&sig_conf_name, ".xml");
@@ -779,7 +779,7 @@
     }
 
     if (o_input == NULL) {
-        StrAppend(&input_name, LOCALSTATE_DIR);
+        StrAppend(&input_name, OPENDNSSEC_STATE_DIR);
         StrAppend(&input_name, "/unsigned/");
         StrAppend(&input_name, o_zone);
     }
@@ -792,7 +792,7 @@
     }
 
     if (o_output == NULL) {
-        StrAppend(&output_name, LOCALSTATE_DIR);
+        StrAppend(&output_name, OPENDNSSEC_STATE_DIR);
         StrAppend(&output_name, "/signed/");
         StrAppend(&output_name, o_zone);
     }
@@ -3403,7 +3403,7 @@
                      * Set a default
                      */
                     /* XXX this should be parse from the the main config */
-                    StrAppend(kasp_filename, CONFIG_DIR);
+                    StrAppend(kasp_filename, OPENDNSSEC_CONFIG_DIR);
                     StrAppend(kasp_filename, "/kasp.xml");
                 }
                 printf("kasp filename set to %s.\n", *kasp_filename);
@@ -3572,7 +3572,7 @@
     KSM_POLICY *policy;
 
     /* Some files, the xml and rng */
-    const char* rngfilename = SCHEMA_DIR "/kasp.rng";
+    const char* rngfilename = OPENDNSSEC_SCHEMA_DIR "/kasp.rng";
 
     /* Load XML document */
     doc = xmlParseFile(kasp_filename);
@@ -4536,7 +4536,7 @@
     char* temp_char = NULL;
 
     /* Some files, the xml and rng */
-    const char* rngfilename = SCHEMA_DIR "/conf.rng";
+    const char* rngfilename = OPENDNSSEC_SCHEMA_DIR "/conf.rng";
 
     /* Load XML document */
     doc = xmlParseFile(config);
@@ -5879,8 +5879,8 @@
     xmlChar *user_expr = (unsigned char*) "//Configuration/Enforcer/Privileges/User";
     xmlChar *group_expr = (unsigned char*) "//Configuration/Enforcer/Privileges/Group";
 
-    char* filename = CONFIG_FILE;
-    char* rngfilename = SCHEMA_DIR "/conf.rng";
+    char* filename = OPENDNSSEC_CONFIG_FILE;
+    char* rngfilename = OPENDNSSEC_SCHEMA_DIR "/conf.rng";
     char* temp_char = NULL;
 
     struct passwd *pwd;
@@ -6267,6 +6267,8 @@
     KSM_PARCOLL         collection;     /* Collection of parameters for zone */
     int deltat;     /* Time interval */
 
+    (void)      zone_id;
+
     /* Set collection defaults */
     KsmCollectionInit(&collection);
 
@@ -6574,6 +6576,8 @@
     KSM_PARCOLL         collection;     /* Collection of parameters for zone */
     int deltat = 0;     /* Time interval */
 
+    (void)      zone_id;
+
     /* Set collection defaults */
     KsmCollectionInit(&collection);
 
@@ -6789,7 +6793,7 @@
 static int restart_enforcerd()
 {
 	/* ToDo: This should really be rewritten so that it will read
-	   ENFORCER_PIDFILE and send a SIGHUP itself */
+	   OPENDNSSEC_ENFORCER_PIDFILE and send a SIGHUP itself */
 	return system(RESTART_ENFORCERD_CMD);
 }
 

Modified: branches/OpenDNSSEC-sion/enforcer/utils/ods-ksmutil.1.in
===================================================================
--- branches/OpenDNSSEC-sion/enforcer/utils/ods-ksmutil.1.in	2010-08-13 11:26:46 UTC (rev 3757)
+++ branches/OpenDNSSEC-sion/enforcer/utils/ods-ksmutil.1.in	2010-08-13 13:45:30 UTC (rev 3758)
@@ -250,11 +250,15 @@
 Note that the KASP Enforcer may take the initiative to generate keys after
 the backup has started and before the backup is done.  In the current version
 of OpenDNSSEC, it is therefore needed to stop the KASP Enforcer to be assured
-that all keys are backed up.  The sequence would therefore be
-.LI Issue \fBods-control ksm stop\fR
-.LI Make a backup of the repository
-.LI Issue \fBods-ksmutil backup done\fR
-.LI Issue \fBods-control ksm start\fR
+that all keys are backed up.  The sequence would therefore be:
+.br
+1. Issue \fBods-control ksm stop\fR
+.br
+2. Make a backup of the repository
+.br
+3. Issue \fBods-ksmutil backup done\fR
+.br
+4. Issue \fBods-control ksm start\fR
 .TP
 .B database backup [\-\-output|\-o output]
 Make a copy of the database of the KASP Enforcer (if using sqlite).




More information about the Opendnssec-commits mailing list