merged in default ENGINE-74
authorKrista Grothoff <krista@pep-project.org>
Tue, 29 Nov 2016 14:10:46 +0100
branchENGINE-74
changeset 1455a7d8d7949924
parent 1454 2265c00358d4
parent 1453 5f9cc3233006
merged in default
     1.1 --- a/src/pEpEngine.c	Tue Nov 29 10:56:52 2016 +0100
     1.2 +++ b/src/pEpEngine.c	Tue Nov 29 14:10:46 2016 +0100
     1.3 @@ -134,7 +134,7 @@
     1.4      sqlite3_busy_timeout(_session->system_db, 1000);
     1.5  
     1.6  // increment this when patching DDL
     1.7 -#define _DDL_USER_VERSION "4"
     1.8 +#define _DDL_USER_VERSION "5"
     1.9  
    1.10      if (in_first) {
    1.11  
    1.12 @@ -287,6 +287,23 @@
    1.13              );
    1.14          }
    1.15  
    1.16 +        if (version < 5) {
    1.17 +            int_result = sqlite3_exec(
    1.18 +                _session->db,
    1.19 +                "delete from pgp_keypair where fpr = '';",
    1.20 +                NULL,
    1.21 +                NULL,
    1.22 +                NULL
    1.23 +            );
    1.24 +            int_result = sqlite3_exec(
    1.25 +                _session->db,
    1.26 +                "delete from trust where pgp_keypair_fpr = '';",
    1.27 +                NULL,
    1.28 +                NULL,
    1.29 +                NULL
    1.30 +            );
    1.31 +        }
    1.32 +
    1.33          if (version < atoi(_DDL_USER_VERSION)) {
    1.34              int_result = sqlite3_exec(
    1.35                  _session->db,