Browse Source

ENGINE-354: fixed bad call to is_pep_user

doc_update_sequoia
Krista Bennett 4 years ago
parent
commit
ec531ea126
2 changed files with 6 additions and 5 deletions
  1. +5
    -4
      src/keymanagement.c
  2. +1
    -1
      src/pEpEngine.c

+ 5
- 4
src/keymanagement.c View File

@ -406,9 +406,7 @@ static PEP_STATUS prepare_updated_identity(PEP_SESSION session,
return_id->fpr = strdup(stored_ident->fpr);
return_id->comm_type = stored_ident->comm_type;
adjust_pep_trust_status(session, return_id);
// We patch the DB with the input username, but if we didn't have
// one, we pull it out of storage if available.
// (also, if the input username is "anonymous" and there exists
@ -435,7 +433,10 @@ static PEP_STATUS prepare_updated_identity(PEP_SESSION session,
if (EMPTYSTR(return_id->user_id)) {
free(return_id->user_id);
return_id->user_id = strdup(stored_ident->user_id);
}
}
adjust_pep_trust_status(session, return_id);
// Call set_identity() to store
if ((is_identity_default || is_user_default) &&
is_address_default) {


+ 1
- 1
src/pEpEngine.c View File

@ -2525,7 +2525,7 @@ DYNAMIC_API PEP_STATUS is_pep_user(PEP_SESSION session, pEp_identity *identity,
return PEP_ILLEGAL_VALUE;
*is_pep = false;
const char* user_id = identity->user_id;
if (!session || EMPTYSTR(user_id))


Loading…
Cancel
Save