[Opendnssec-commits] [svn.opendnssec.org/svn/dnssec] r6042 - in branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src: enforcer hsmkey keystate policy protobuf-orm signconf

yuri at NLnetLabs.nl yuri at NLnetLabs.nl
Mon Jan 9 12:29:40 CET 2012


Author: yuri
Date: 2012-01-09 12:29:40 +0100 (Mon, 09 Jan 2012)
New Revision: 6042

Modified:
   branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforce_task.cpp
   branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/hsmkey/hsmkey_list_task.cpp
   branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/keystate/update_keyzones_task.cpp
   branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/policy/update_kasp_task.cpp
   branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-common.h
   branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-database-dbi.cc
   branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-database-sqlite3.cc
   branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-database.cc
   branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-delete.cc
   branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-delete.h
   branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-enum.cc
   branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-enum.h
   branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-str.cc
   branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/signconf/signconf_task.cpp
Log:
Make it compile on my machine


Modified: branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforce_task.cpp
===================================================================
--- branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforce_task.cpp	2012-01-09 10:32:41 UTC (rev 6041)
+++ branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/enforcer/enforce_task.cpp	2012-01-09 11:29:40 UTC (rev 6042)
@@ -1,6 +1,7 @@
 #include <ctime>
 #include <iostream>
 #include <cassert>
+#include <memory>
 #include <fcntl.h>
 #include <map>
 

Modified: branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/hsmkey/hsmkey_list_task.cpp
===================================================================
--- branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/hsmkey/hsmkey_list_task.cpp	2012-01-09 10:32:41 UTC (rev 6041)
+++ branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/hsmkey/hsmkey_list_task.cpp	2012-01-09 11:29:40 UTC (rev 6042)
@@ -57,14 +57,14 @@
 		
 		if (!transaction.started()) {
 			ods_printf(sockfd,"error: database transaction failed\n");
-			return false;
+			return;
 		}
 			
 		{	OrmResultRef rows;
 
 			if (!OrmMessageEnum(conn, ::ods::hsmkey::HsmKey::descriptor(), rows)) {
 				ods_printf(sockfd,"error: database hsm key enumeration failed\n");
-				return false;
+				return;
 			}
 			
 			// Enumerate the hsm keys referenced in the database

Modified: branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/keystate/update_keyzones_task.cpp
===================================================================
--- branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/keystate/update_keyzones_task.cpp	2012-01-09 10:32:41 UTC (rev 6041)
+++ branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/keystate/update_keyzones_task.cpp	2012-01-09 11:29:40 UTC (rev 6042)
@@ -9,6 +9,7 @@
 #include "keystate/keystate.pb.h"
 #include "xmlext-pb/xmlext-rd.h"
 
+#include <memory>
 #include <fcntl.h>
 
 #include "protobuf-orm/pb-orm.h"

Modified: branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/policy/update_kasp_task.cpp
===================================================================
--- branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/policy/update_kasp_task.cpp	2012-01-09 10:32:41 UTC (rev 6041)
+++ branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/policy/update_kasp_task.cpp	2012-01-09 11:29:40 UTC (rev 6042)
@@ -12,7 +12,7 @@
 #include "protobuf-orm/pb-orm.h"
 #include "daemon/orm.h"
 
-#include <memory.h>
+#include <memory>
 #include <fcntl.h>
 
 static const char *module_str = "update_kasp_task";

Modified: branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-common.h
===================================================================
--- branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-common.h	2012-01-09 10:32:41 UTC (rev 6041)
+++ branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-common.h	2012-01-09 11:29:40 UTC (rev 6042)
@@ -51,7 +51,7 @@
 
 // Select the type of the database client library to use.
 #define USE_CLIENT_LIB_DBI 1		// uses libdbi (has errors in sqlite3 driver)
-//#define USE_CLIENT_LIB_SQLITE3 1	// use SQLite3 lib directly (bypassing libdbi)
+//~ #define USE_CLIENT_LIB_SQLITE3 1	// use SQLite3 lib directly (bypassing libdbi)
 
 // Select the actual database driver to use with libdbi
 #ifdef USE_CLIENT_LIB_DBI

Modified: branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-database-dbi.cc
===================================================================
--- branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-database-dbi.cc	2012-01-09 10:32:41 UTC (rev 6041)
+++ branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-database-dbi.cc	2012-01-09 11:29:40 UTC (rev 6042)
@@ -37,6 +37,7 @@
 #include "pb-orm-log.h"
 
 #include <dbi/dbi.h>
+#include <cstdio>
 
 namespace DB {
 	

Modified: branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-database-sqlite3.cc
===================================================================
--- branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-database-sqlite3.cc	2012-01-09 10:32:41 UTC (rev 6041)
+++ branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-database-sqlite3.cc	2012-01-09 11:29:40 UTC (rev 6042)
@@ -37,6 +37,7 @@
 #include <time.h>
 #include <map>
 #include <sqlite3.h>
+#include <cstdio>
 
 #include "pb-orm-str.h"
 #include "pb-orm-log.h"

Modified: branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-database.cc
===================================================================
--- branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-database.cc	2012-01-09 10:32:41 UTC (rev 6041)
+++ branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-database.cc	2012-01-09 11:29:40 UTC (rev 6042)
@@ -33,6 +33,9 @@
 #include "pb-orm-log.h"
 #include "pb-orm-str.h"
 
+#include <stdio.h> 
+#include <stdarg.h>
+
 namespace DB {
 
 	///////////////////////////

Modified: branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-delete.cc
===================================================================
--- branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-delete.cc	2012-01-09 10:32:41 UTC (rev 6041)
+++ branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-delete.cc	2012-01-09 11:29:40 UTC (rev 6042)
@@ -39,6 +39,9 @@
 
 #include "orm.pb.h"
 
+#include <stdio.h> 
+#include <stdarg.h>
+
 bool OrmMessageDelete(OrmConn conn,const pb::Descriptor *descriptor,pb::uint64 id)
 {
 	return OrmMessageDeleteWhere(conn,descriptor,"id=%llu",id);

Modified: branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-delete.h
===================================================================
--- branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-delete.h	2012-01-09 10:32:41 UTC (rev 6041)
+++ branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-delete.h	2012-01-09 11:29:40 UTC (rev 6042)
@@ -33,6 +33,7 @@
 #define pb_orm_delete_h
 
 #include "pb-orm-common.h"
+#include <cstdarg>
 
 // Delete a message from a table. This will recursively delete all the 
 // data associated with the messages being deleted.

Modified: branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-enum.cc
===================================================================
--- branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-enum.cc	2012-01-09 10:32:41 UTC (rev 6041)
+++ branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-enum.cc	2012-01-09 11:29:40 UTC (rev 6042)
@@ -34,6 +34,9 @@
 #include "pb-orm-log.h"
 #include "pb-orm-database.h"
 
+#include <stdio.h> 
+#include <stdarg.h>
+
 bool OrmConnQuery(OrmConn conn,
 				  const std::string &statement,
 				  OrmResult &result)
@@ -299,7 +302,7 @@
 {
 	if (result==NULL || !RESULT.assigned())
 		return false;
-	return RESULT->get_numrows(size);
+	return RESULT->get_numrows((unsigned long long &)size);
 }
 
 bool OrmFirst(OrmResult result)

Modified: branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-enum.h
===================================================================
--- branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-enum.h	2012-01-09 10:32:41 UTC (rev 6041)
+++ branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-enum.h	2012-01-09 11:29:40 UTC (rev 6042)
@@ -33,6 +33,7 @@
 #define pb_orm_enum_h
 
 #include "pb-orm-common.h"
+#include <cstdarg>
 
 bool OrmConnQuery(OrmConn conn,
 				  const std::string &statement,

Modified: branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-str.cc
===================================================================
--- branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-str.cc	2012-01-09 10:32:41 UTC (rev 6041)
+++ branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/protobuf-orm/pb-orm-str.cc	2012-01-09 11:29:40 UTC (rev 6042)
@@ -33,6 +33,9 @@
 #include "pb-orm-log.h"
 #include "pb-orm-database.h"
 
+#include <stdio.h> 
+#include <stdarg.h>
+
 bool OrmFormat(std::string &dest, const char *format, ...)
 {
 	char buf[128];

Modified: branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/signconf/signconf_task.cpp
===================================================================
--- branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/signconf/signconf_task.cpp	2012-01-09 10:32:41 UTC (rev 6041)
+++ branches/OpenDNSSEC-enforcer-ng/enforcer-ng/src/signconf/signconf_task.cpp	2012-01-09 11:29:40 UTC (rev 6042)
@@ -1,3 +1,4 @@
+#include <memory>
 #include <fcntl.h>
 
 #include "signconf/signconf_task.h"




More information about the Opendnssec-commits mailing list