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

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


Author: matthijs
Date: 2010-08-11 11:27:23 +0200 (Wed, 11 Aug 2010)
New Revision: 3730

Modified:
   trunk/OpenDNSSEC/auditor/m4/opendnssec_common.m4
   trunk/OpenDNSSEC/m4/opendnssec_common.m4
   trunk/OpenDNSSEC/plugins/eppclient/m4/opendnssec_common.m4
   trunk/OpenDNSSEC/signer/src/util/file.c
   trunk/utils/m4/opendnssec_common.m4
Log:
full pathname for cp

http://www.pivotaltracker.com/story/show/3999464



Modified: trunk/OpenDNSSEC/auditor/m4/opendnssec_common.m4
===================================================================
--- trunk/OpenDNSSEC/auditor/m4/opendnssec_common.m4	2010-08-11 09:23:15 UTC (rev 3729)
+++ trunk/OpenDNSSEC/auditor/m4/opendnssec_common.m4	2010-08-11 09:27:23 UTC (rev 3730)
@@ -61,14 +61,17 @@
 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/m4/opendnssec_common.m4
===================================================================
--- trunk/OpenDNSSEC/m4/opendnssec_common.m4	2010-08-11 09:23:15 UTC (rev 3729)
+++ trunk/OpenDNSSEC/m4/opendnssec_common.m4	2010-08-11 09:27:23 UTC (rev 3730)
@@ -61,14 +61,17 @@
 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 09:23:15 UTC (rev 3729)
+++ trunk/OpenDNSSEC/plugins/eppclient/m4/opendnssec_common.m4	2010-08-11 09:27:23 UTC (rev 3730)
@@ -61,14 +61,17 @@
 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/util/file.c
===================================================================
--- trunk/OpenDNSSEC/signer/src/util/file.c	2010-08-11 09:23:15 UTC (rev 3729)
+++ trunk/OpenDNSSEC/signer/src/util/file.c	2010-08-11 09:27:23 UTC (rev 3730)
@@ -292,7 +292,8 @@
     se_log_assert(file1);
     se_log_assert(file2);
 
-    snprintf(str, SYSTEM_MAXLEN, "cp %s %s", file1, file2);
+    snprintf(str, SYSTEM_MAXLEN, "%s %s %s",
+        OPENDNSSEC_CP_COMMAND, file1, file2);
     se_log_debug("system call: %s", str);
     return system(str);
 }

Modified: trunk/utils/m4/opendnssec_common.m4
===================================================================
--- trunk/utils/m4/opendnssec_common.m4	2010-08-11 09:23:15 UTC (rev 3729)
+++ trunk/utils/m4/opendnssec_common.m4	2010-08-11 09:27:23 UTC (rev 3730)
@@ -61,14 +61,17 @@
 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