[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r3739 - in trunk: OpenDNSSEC OpenDNSSEC/auditor/m4 OpenDNSSEC/m4 OpenDNSSEC/plugins/eppclient/m4 OpenDNSSEC/signer/src OpenDNSSEC/signer/src/daemon OpenDNSSEC/signer/src/signer utils/m4

Matthijs Mekking matthijs at nlnetlabs.nl
Wed Aug 11 15:38:27 CEST 2010


Author: matthijs
Date: 2010-08-11 15:38:26 +0200 (Wed, 11 Aug 2010)
New Revision: 3739

Added:
   trunk/OpenDNSSEC/signer/src/daemon/cfg.c
   trunk/OpenDNSSEC/signer/src/daemon/cfg.h
Removed:
   trunk/OpenDNSSEC/signer/src/daemon/config.c
   trunk/OpenDNSSEC/signer/src/daemon/config.h
Modified:
   trunk/OpenDNSSEC/auditor/m4/opendnssec_common.m4
   trunk/OpenDNSSEC/configure.ac
   trunk/OpenDNSSEC/m4/opendnssec_common.m4
   trunk/OpenDNSSEC/plugins/eppclient/m4/opendnssec_common.m4
   trunk/OpenDNSSEC/signer/src/Makefile.am
   trunk/OpenDNSSEC/signer/src/daemon/engine.c
   trunk/OpenDNSSEC/signer/src/daemon/engine.h
   trunk/OpenDNSSEC/signer/src/signer/tools.h
   trunk/utils/m4/opendnssec_common.m4
Log:
better cp recognition

move daemon/config.{c,h} -> daemon/cfg.{c,h}



Modified: trunk/OpenDNSSEC/auditor/m4/opendnssec_common.m4
===================================================================
--- trunk/OpenDNSSEC/auditor/m4/opendnssec_common.m4	2010-08-11 13:27:31 UTC (rev 3738)
+++ trunk/OpenDNSSEC/auditor/m4/opendnssec_common.m4	2010-08-11 13:38:26 UTC (rev 3739)
@@ -61,17 +61,14 @@
 OPENDNSSEC_SIGNER_ENGINE=$OPENDNSSEC_SBIN_DIR/ods-signerd
 OPENDNSSEC_SIGNER_AUDITOR=$OPENDNSSEC_BIN_DIR/ods-auditor
 OPENDNSSEC_SIGNER_CLI=$OPENDNSSEC_SBIN_DIR/ods-signer
-OPENDNSSEC_CP_COMMAND="`which cp`"
 
 AC_SUBST([OPENDNSSEC_SIGNER_SOCKET])
 AC_SUBST([OPENDNSSEC_SIGNER_ENGINE])
 AC_SUBST([OPENDNSSEC_SIGNER_CLI])
-AC_SUBST([OPENDNSSEC_CP_COMMAND])
 
 AC_DEFINE_UNQUOTED(OPENDNSSEC_SIGNER_SOCKET, "$OPENDNSSEC_SIGNER_SOCKET", [Path to the OpenDNSSEC signer socket])
 AC_DEFINE_UNQUOTED(OPENDNSSEC_SIGNER_ENGINE, "$OPENDNSSEC_SIGNER_ENGINE", [Path to the OpenDNSSEC signer engine])
 AC_DEFINE_UNQUOTED(OPENDNSSEC_SIGNER_CLI,    "$OPENDNSSEC_SIGNER_CLI",    [Path to the OpenDNSSEC signer cli])
-AC_DEFINE_UNQUOTED(OPENDNSSEC_CP_COMMAND,    "$OPENDNSSEC_CP_COMMAND",    [Path to the systems cp])
 
 AC_DEFINE_UNQUOTED(ODS_SE_PIDFILE,  ["$OPENDNSSEC_SIGNER_PIDFILE"],    [Path to the OpenDNSSEC signer engine pid file])
 AC_DEFINE_UNQUOTED(ODS_ZF_PIDFILE,  ["$OPENDNSSEC_FETCH_PIDFILE"],    [Path to the OpenDNSSEC signer engine pid file])

Modified: trunk/OpenDNSSEC/configure.ac
===================================================================
--- trunk/OpenDNSSEC/configure.ac	2010-08-11 13:27:31 UTC (rev 3738)
+++ trunk/OpenDNSSEC/configure.ac	2010-08-11 13:38:26 UTC (rev 3739)
@@ -26,6 +26,9 @@
 AC_PATH_PROG(XMLLINT, xmllint)
 AC_PATH_PROG(XSLTPROC, xsltproc)
 AC_PATH_PROG(JAVA, java)
+AC_PATH_PROG(OPENDNSSEC_CP_COMMAND, cp)
+AC_SUBST([OPENDNSSEC_CP_COMMAND])
+AC_DEFINE_UNQUOTED(OPENDNSSEC_CP_COMMAND, "$OPENDNSSEC_CP_COMMAND", [system cp])
 
 # building
 ACX_ARG_RPATH

Modified: trunk/OpenDNSSEC/m4/opendnssec_common.m4
===================================================================
--- trunk/OpenDNSSEC/m4/opendnssec_common.m4	2010-08-11 13:27:31 UTC (rev 3738)
+++ trunk/OpenDNSSEC/m4/opendnssec_common.m4	2010-08-11 13:38:26 UTC (rev 3739)
@@ -61,17 +61,14 @@
 OPENDNSSEC_SIGNER_ENGINE=$OPENDNSSEC_SBIN_DIR/ods-signerd
 OPENDNSSEC_SIGNER_AUDITOR=$OPENDNSSEC_BIN_DIR/ods-auditor
 OPENDNSSEC_SIGNER_CLI=$OPENDNSSEC_SBIN_DIR/ods-signer
-OPENDNSSEC_CP_COMMAND="`which cp`"
 
 AC_SUBST([OPENDNSSEC_SIGNER_SOCKET])
 AC_SUBST([OPENDNSSEC_SIGNER_ENGINE])
 AC_SUBST([OPENDNSSEC_SIGNER_CLI])
-AC_SUBST([OPENDNSSEC_CP_COMMAND])
 
 AC_DEFINE_UNQUOTED(OPENDNSSEC_SIGNER_SOCKET, "$OPENDNSSEC_SIGNER_SOCKET", [Path to the OpenDNSSEC signer socket])
 AC_DEFINE_UNQUOTED(OPENDNSSEC_SIGNER_ENGINE, "$OPENDNSSEC_SIGNER_ENGINE", [Path to the OpenDNSSEC signer engine])
 AC_DEFINE_UNQUOTED(OPENDNSSEC_SIGNER_CLI,    "$OPENDNSSEC_SIGNER_CLI",    [Path to the OpenDNSSEC signer cli])
-AC_DEFINE_UNQUOTED(OPENDNSSEC_CP_COMMAND,    "$OPENDNSSEC_CP_COMMAND",    [Path to the systems cp])
 
 AC_DEFINE_UNQUOTED(ODS_SE_PIDFILE,  ["$OPENDNSSEC_SIGNER_PIDFILE"],    [Path to the OpenDNSSEC signer engine pid file])
 AC_DEFINE_UNQUOTED(ODS_ZF_PIDFILE,  ["$OPENDNSSEC_FETCH_PIDFILE"],    [Path to the OpenDNSSEC signer engine pid file])

Modified: trunk/OpenDNSSEC/plugins/eppclient/m4/opendnssec_common.m4
===================================================================
--- trunk/OpenDNSSEC/plugins/eppclient/m4/opendnssec_common.m4	2010-08-11 13:27:31 UTC (rev 3738)
+++ trunk/OpenDNSSEC/plugins/eppclient/m4/opendnssec_common.m4	2010-08-11 13:38:26 UTC (rev 3739)
@@ -61,17 +61,14 @@
 OPENDNSSEC_SIGNER_ENGINE=$OPENDNSSEC_SBIN_DIR/ods-signerd
 OPENDNSSEC_SIGNER_AUDITOR=$OPENDNSSEC_BIN_DIR/ods-auditor
 OPENDNSSEC_SIGNER_CLI=$OPENDNSSEC_SBIN_DIR/ods-signer
-OPENDNSSEC_CP_COMMAND="`which cp`"
 
 AC_SUBST([OPENDNSSEC_SIGNER_SOCKET])
 AC_SUBST([OPENDNSSEC_SIGNER_ENGINE])
 AC_SUBST([OPENDNSSEC_SIGNER_CLI])
-AC_SUBST([OPENDNSSEC_CP_COMMAND])
 
 AC_DEFINE_UNQUOTED(OPENDNSSEC_SIGNER_SOCKET, "$OPENDNSSEC_SIGNER_SOCKET", [Path to the OpenDNSSEC signer socket])
 AC_DEFINE_UNQUOTED(OPENDNSSEC_SIGNER_ENGINE, "$OPENDNSSEC_SIGNER_ENGINE", [Path to the OpenDNSSEC signer engine])
 AC_DEFINE_UNQUOTED(OPENDNSSEC_SIGNER_CLI,    "$OPENDNSSEC_SIGNER_CLI",    [Path to the OpenDNSSEC signer cli])
-AC_DEFINE_UNQUOTED(OPENDNSSEC_CP_COMMAND,    "$OPENDNSSEC_CP_COMMAND",    [Path to the systems cp])
 
 AC_DEFINE_UNQUOTED(ODS_SE_PIDFILE,  ["$OPENDNSSEC_SIGNER_PIDFILE"],    [Path to the OpenDNSSEC signer engine pid file])
 AC_DEFINE_UNQUOTED(ODS_ZF_PIDFILE,  ["$OPENDNSSEC_FETCH_PIDFILE"],    [Path to the OpenDNSSEC signer engine pid file])

Modified: trunk/OpenDNSSEC/signer/src/Makefile.am
===================================================================
--- trunk/OpenDNSSEC/signer/src/Makefile.am	2010-08-11 13:27:31 UTC (rev 3738)
+++ trunk/OpenDNSSEC/signer/src/Makefile.am	2010-08-11 13:38:26 UTC (rev 3739)
@@ -21,7 +21,7 @@
 				adapter/adapter.c adapter/adapter.h \
 				adapter/adfile.c adapter/adfile.h \
 				daemon/cmdhandler.c daemon/cmdhandler.h \
-				daemon/config.c daemon/config.h \
+				daemon/cfg.c daemon/cfg.h \
 				daemon/engine.c daemon/engine.h \
 				daemon/signal.c daemon/signal.h \
 				daemon/worker.c daemon/worker.h \

Modified: trunk/OpenDNSSEC/signer/src/daemon/engine.c
===================================================================
--- trunk/OpenDNSSEC/signer/src/daemon/engine.c	2010-08-11 13:27:31 UTC (rev 3738)
+++ trunk/OpenDNSSEC/signer/src/daemon/engine.c	2010-08-11 13:38:26 UTC (rev 3739)
@@ -33,7 +33,7 @@
 
 #include "config.h"
 #include "daemon/cmdhandler.h"
-#include "daemon/config.h"
+#include "daemon/cfg.h"
 #include "daemon/engine.h"
 #include "daemon/signal.h"
 #include "daemon/worker.h"

Modified: trunk/OpenDNSSEC/signer/src/daemon/engine.h
===================================================================
--- trunk/OpenDNSSEC/signer/src/daemon/engine.h	2010-08-11 13:27:31 UTC (rev 3738)
+++ trunk/OpenDNSSEC/signer/src/daemon/engine.h	2010-08-11 13:38:26 UTC (rev 3739)
@@ -36,7 +36,7 @@
 
 #include "config.h"
 #include "daemon/cmdhandler.h"
-#include "daemon/config.h"
+#include "daemon/cfg.h"
 #include "daemon/worker.h"
 #include "scheduler/locks.h"
 #include "scheduler/task.h"

Modified: trunk/OpenDNSSEC/signer/src/signer/tools.h
===================================================================
--- trunk/OpenDNSSEC/signer/src/signer/tools.h	2010-08-11 13:27:31 UTC (rev 3738)
+++ trunk/OpenDNSSEC/signer/src/signer/tools.h	2010-08-11 13:38:26 UTC (rev 3739)
@@ -35,7 +35,7 @@
 #define SIGNER_TOOLS_H
 
 #include "config.h"
-#include "daemon/config.h"
+#include "daemon/cfg.h"
 #include "signer/zone.h"
 
 /**

Modified: trunk/utils/m4/opendnssec_common.m4
===================================================================
--- trunk/utils/m4/opendnssec_common.m4	2010-08-11 13:27:31 UTC (rev 3738)
+++ trunk/utils/m4/opendnssec_common.m4	2010-08-11 13:38:26 UTC (rev 3739)
@@ -61,17 +61,14 @@
 OPENDNSSEC_SIGNER_ENGINE=$OPENDNSSEC_SBIN_DIR/ods-signerd
 OPENDNSSEC_SIGNER_AUDITOR=$OPENDNSSEC_BIN_DIR/ods-auditor
 OPENDNSSEC_SIGNER_CLI=$OPENDNSSEC_SBIN_DIR/ods-signer
-OPENDNSSEC_CP_COMMAND="`which cp`"
 
 AC_SUBST([OPENDNSSEC_SIGNER_SOCKET])
 AC_SUBST([OPENDNSSEC_SIGNER_ENGINE])
 AC_SUBST([OPENDNSSEC_SIGNER_CLI])
-AC_SUBST([OPENDNSSEC_CP_COMMAND])
 
 AC_DEFINE_UNQUOTED(OPENDNSSEC_SIGNER_SOCKET, "$OPENDNSSEC_SIGNER_SOCKET", [Path to the OpenDNSSEC signer socket])
 AC_DEFINE_UNQUOTED(OPENDNSSEC_SIGNER_ENGINE, "$OPENDNSSEC_SIGNER_ENGINE", [Path to the OpenDNSSEC signer engine])
 AC_DEFINE_UNQUOTED(OPENDNSSEC_SIGNER_CLI,    "$OPENDNSSEC_SIGNER_CLI",    [Path to the OpenDNSSEC signer cli])
-AC_DEFINE_UNQUOTED(OPENDNSSEC_CP_COMMAND,    "$OPENDNSSEC_CP_COMMAND",    [Path to the systems cp])
 
 AC_DEFINE_UNQUOTED(ODS_SE_PIDFILE,  ["$OPENDNSSEC_SIGNER_PIDFILE"],    [Path to the OpenDNSSEC signer engine pid file])
 AC_DEFINE_UNQUOTED(ODS_ZF_PIDFILE,  ["$OPENDNSSEC_FETCH_PIDFILE"],    [Path to the OpenDNSSEC signer engine pid file])




More information about the Opendnssec-commits mailing list