diff options
| author | Werner Koch <[email protected]> | 2004-12-17 14:36:16 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2004-12-17 14:36:16 +0000 |
| commit | 0ccb120f68954cead774b821b52fbd0d9d5eb65c (patch) | |
| tree | 5daf50e8571f7052a06849a1e9bf93b0fd19bd9d /sm/call-dirmngr.c | |
| parent | (lookup_status_cb): Send progress messages (diff) | |
| download | gnupg-0ccb120f68954cead774b821b52fbd0d9d5eb65c.tar.gz gnupg-0ccb120f68954cead774b821b52fbd0d9d5eb65c.zip | |
* call-dirmngr.c (isvalid_status_cb, lookup_status_cb)
(run_command_status_cb): Return cancel status if gpgsm_status
returned an error.
* server.c (gpgsm_status, gpgsm_status2)
(gpgsm_status_with_err_code): Return an error code.
(gpgsm_status2): Always call va_end().
Diffstat (limited to '')
| -rw-r--r-- | sm/call-dirmngr.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c index 44246daa6..d00a53db5 100644 --- a/sm/call-dirmngr.c +++ b/sm/call-dirmngr.c @@ -355,7 +355,8 @@ isvalid_status_cb (void *opaque, const char *line) { for (line += 8; *line == ' '; line++) ; - gpgsm_status (parm->ctrl, STATUS_PROGRESS, line); + if (gpgsm_status (parm->ctrl, STATUS_PROGRESS, line)) + return ASSUAN_Canceled; } } else if (!strncmp (line, "ONLY_VALID_IF_CERT_VALID", 24) @@ -625,7 +626,8 @@ lookup_status_cb (void *opaque, const char *line) { for (line += 8; *line == ' '; line++) ; - gpgsm_status (parm->ctrl, STATUS_PROGRESS, line); + if (gpgsm_status (parm->ctrl, STATUS_PROGRESS, line)) + return ASSUAN_Canceled; } } else if (!strncmp (line, "TRUNCATED", 9) && (line[9]==' ' || !line[9])) @@ -760,7 +762,8 @@ run_command_status_cb (void *opaque, const char *line) { for (line += 8; *line == ' '; line++) ; - gpgsm_status (ctrl, STATUS_PROGRESS, line); + if (gpgsm_status (ctrl, STATUS_PROGRESS, line)) + return ASSUAN_Canceled; } } return 0; |