ENGINE-939: If we're not going to import keys from 2.0 messages, we need to guarantee it's not the default setting anywhere for new pEp users. (This was changed as a last minute fix before KER was checked in and unfortunately didn't trigger test failures.)

src/keymanagement.c

@@ -453,7 +453,7 @@ static void adjust_pEp_trust_status(PEP_SESSION session, pEp_identity* identity)
         identity->comm_type = PEP_ct_pEp_unconfirmed | confirmation_status;
         if (identity->major_ver == 0) {
             identity->major_ver = 2;
-            identity->minor_ver = 0;
+            identity->minor_ver = 1;
         }    
     }
 }

src/pEpEngine.c

@@ -1458,7 +1458,7 @@ PEP_STATUS update_pEp_user_trust_vals(PEP_SESSION session,
     if (result != SQLITE_DONE)
         return PEP_CANNOT_SET_TRUST;
 
-    PEP_STATUS status = upgrade_pEp_version_by_user_id(session, user, 2, 0);
+    PEP_STATUS status = upgrade_pEp_version_by_user_id(session, user, 2, 1);
     
     return status;
 }
@@ -2396,7 +2396,7 @@ PEP_STATUS replace_userid(PEP_SESSION session, const char* old_uid,
             SQLITE_STATIC);
     result = sqlite3_step(session->replace_userid);
 #ifndef NDEBUG
-    if (result) {
+    if (result != SQLITE_DONE) {
         const char *errmsg = sqlite3_errmsg(session->db);
         log_event(session, "SQLite3 error", "replace_userid", errmsg, NULL);
     }