aboutsummaryrefslogtreecommitdiffstats
path: root/tests/gpg/t-import.c
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2003-05-27 08:31:33 +0000
committerMarcus Brinkmann <[email protected]>2003-05-27 08:31:33 +0000
commit64b0e7004ff9df4ca05c2fe1efcae469d0b19261 (patch)
tree2a20d506c99fa3acfe308fb959f43d75bc304b86 /tests/gpg/t-import.c
parent2003-05-27 Marcus Brinkmann <[email protected]> (diff)
downloadgpgme-64b0e7004ff9df4ca05c2fe1efcae469d0b19261.tar.gz
gpgme-64b0e7004ff9df4ca05c2fe1efcae469d0b19261.zip
Fix last changes.
Diffstat (limited to 'tests/gpg/t-import.c')
-rw-r--r--tests/gpg/t-import.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/gpg/t-import.c b/tests/gpg/t-import.c
index bea6a0d9..fd275080 100644
--- a/tests/gpg/t-import.c
+++ b/tests/gpg/t-import.c
@@ -107,7 +107,7 @@ check_result (gpgme_import_result_t result, char *fpr, int secret)
}
if ((secret
&& ((result->secret_imported == 0 && result->new_signatures != 0)
- || (result->secret_imported == 1 && result->new_signatures != 1)))
+ || (result->secret_imported == 1 && result->new_signatures > 1)))
|| (!secret && result->new_signatures != 0))
{
fprintf (stderr, "Unexpected number of new signatures %i\n",
@@ -199,8 +199,8 @@ check_result (gpgme_import_result_t result, char *fpr, int secret)
{
if (result->imports->status
!= (GPGME_IMPORT_SECRET | GPGME_IMPORT_NEW)
- || !result->imports->next
- || result->imports->next->status != GPGME_IMPORT_SIG)
+ || (result->imports->next
+ && result->imports->next->status != GPGME_IMPORT_SIG))
{
fprintf (stderr, "Unexpected status %i\n",
result->imports->status);