diff options
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/Makefile.am | 8 | ||||
| -rw-r--r-- | agent/command.c | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/agent/Makefile.am b/agent/Makefile.am index fe2d7d222..4da1ea9d8 100644 --- a/agent/Makefile.am +++ b/agent/Makefile.am @@ -19,10 +19,8 @@ bin_PROGRAMS = gpg-agent libexec_PROGRAMS = gpg-protect-tool -if !HAVE_W32CE_SYSTEM # fixme: Do no use simple-pwquery for preset-passphrase. libexec_PROGRAMS += gpg-preset-passphrase -endif noinst_PROGRAMS = $(TESTS) EXTRA_DIST = ChangeLog-2011 gpg-agent-w32info.rc all-tests.scm @@ -66,11 +64,7 @@ gpg_agent_SOURCES = \ common_libs = $(libcommon) commonpth_libs = $(libcommonpth) -if HAVE_W32CE_SYSTEM -pwquery_libs = -else pwquery_libs = ../common/libsimple-pwquery.a -endif gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS) \ @@ -79,7 +73,7 @@ gpg_agent_LDADD = $(commonpth_libs) \ $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(NPTH_LIBS) \ $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) \ $(resource_objs) -gpg_agent_LDFLAGS = $(extra_bin_ldflags) +gpg_agent_LDFLAGS = gpg_agent_DEPENDENCIES = $(resource_objs) gpg_protect_tool_SOURCES = \ diff --git a/agent/command.c b/agent/command.c index 8b5434bfb..c113caba7 100644 --- a/agent/command.c +++ b/agent/command.c @@ -2624,7 +2624,7 @@ cmd_scd (assuan_context_t ctx, char *line) argc = split_fields (l, argv, DIM (argv)); /* These commands are allowed. */ - if ((argc == 1 && !strcmp (argv[0], "SERIALNO")) + if ((argc >= 1 && !strcmp (argv[0], "SERIALNO")) || (argc == 2 && !strcmp (argv[0], "GETINFO") && !strcmp (argv[1], "version")) |