diff options
| author | NIIBE Yutaka <[email protected]> | 2017-10-26 02:24:39 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2017-10-26 02:39:49 +0000 |
| commit | 05cb87276c21c3a47226c75026fa46a955553dd9 (patch) | |
| tree | 2603f9a046c99747b3aed12efdf8c274f2b23f13 /agent/command.c | |
| parent | Fix comment of configure. (diff) | |
| download | gnupg-05cb87276c21c3a47226c75026fa46a955553dd9.tar.gz gnupg-05cb87276c21c3a47226c75026fa46a955553dd9.zip | |
agent, tests: Support --disable-scdaemon build case.
* agent/command.c (cmd_scd): Support !BUILD_WITH_SCDAEMON.
* tests/openpgp/defs.scm (create-gpghome): Likewise.
* tests/gpgsm/gpgsm-defs.scm (create-gpgsmhome): Likewise.
--
We could modify gpg-agent to remove all support of scdaemon, with no
inclusion of call-scd.c, divert-scd.c, and learncard.c, but it would
not be worth to do that.
GnuPG-bug-id: 3316
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'agent/command.c')
| -rw-r--r-- | agent/command.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/agent/command.c b/agent/command.c index f2a668306..e20361a11 100644 --- a/agent/command.c +++ b/agent/command.c @@ -1988,14 +1988,17 @@ static const char hlp_scd[] = static gpg_error_t cmd_scd (assuan_context_t ctx, char *line) { - ctrl_t ctrl = assuan_get_pointer (ctx); int rc; - +#ifdef BUILD_WITH_SCDAEMON + ctrl_t ctrl = assuan_get_pointer (ctx); if (ctrl->restricted) return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN)); rc = divert_generic_cmd (ctrl, line, ctx); - +#else + (void)ctx; (void)line; + rc = gpg_error (GPG_ERR_NOT_SUPPORTED); +#endif return rc; } |