When logging to the database, the IDs of an IKE SA are initially NULL.

diff --git a/src/libcharon/plugins/sql/mysql.sql b/src/libcharon/plugins/sql/mysql.sql
index 1a01394b6ee8f850ffa83cc94c762e7cbe259965..ea4b7e7cb87c361c1e82e4dd36e2319a0cffbb96 100644 (file)
--- a/src/libcharon/plugins/sql/mysql.sql
+++ b/src/libcharon/plugins/sql/mysql.sql
@@ -201,9 +201,9 @@ CREATE TABLE ike_sas (
   `id` int(10) unsigned NOT NULL,
   `initiator` tinyint(1) NOT NULL,
   `local_id_type` tinyint(3) NOT NULL,
-  `local_id_data` varbinary(64) NOT NULL,
+  `local_id_data` varbinary(64) DEFAULT NULL,
   `remote_id_type` tinyint(3) NOT NULL,
-  `remote_id_data` varbinary(64) NOT NULL,
+  `remote_id_data` varbinary(64) DEFAULT NULL,
   `host_family` tinyint(3) NOT NULL,
   `local_host_data` varbinary(16) NOT NULL,
   `remote_host_data` varbinary(16) NOT NULL,

diff --git a/src/libcharon/plugins/sql/sqlite.sql b/src/libcharon/plugins/sql/sqlite.sql
index 53d64dc3491a3eb421c28ee221987f3bbd8c20f1..a036eeee8ed1a3d7cfcc1feb0b6fad71c68ecefb 100644 (file)
--- a/src/libcharon/plugins/sql/sqlite.sql
+++ b/src/libcharon/plugins/sql/sqlite.sql
@@ -206,9 +206,9 @@ CREATE TABLE ike_sas (
   id INTEGER NOT NULL,
   initiator INTEGER NOT NULL,
   local_id_type INTEGER NOT NULL,
-  local_id_data BLOB NOT NULL,
+  local_id_data BLOB DEFAULT NULL,
   remote_id_type INTEGER NOT NULL,
-  remote_id_data BLOB NOT NULL,
+  remote_id_data BLOB DEFAULT NULL,
   host_family INTEGER NOT NULL,
   local_host_data BLOB NOT NULL,
   remote_host_data BLOB NOT NULL,

diff --git a/testing/hosts/default/etc/ipsec.d/tables.sql b/testing/hosts/default/etc/ipsec.d/tables.sql
index a7c5f1d816afcf9ad93f69ffb70f866d1447faa5..0e880826d119d75229dcaaa11957aa811a044e8a 100644 (file)
--- a/testing/hosts/default/etc/ipsec.d/tables.sql
+++ b/testing/hosts/default/etc/ipsec.d/tables.sql
@@ -197,9 +197,9 @@ CREATE TABLE ike_sas (
   id INTEGER NOT NULL,
   initiator INTEGER NOT NULL,
   local_id_type INTEGER NOT NULL,
-  local_id_data BLOB NOT NULL,
+  local_id_data BLOB DEFAULT NULL,
   remote_id_type INTEGER NOT NULL,
-  remote_id_data BLOB NOT NULL,
+  remote_id_data BLOB DEFAULT NULL,
   host_family INTEGER NOT NULL,
   local_host_data BLOB NOT NULL,
   remote_host_data BLOB NOT NULL,