New scd getinfo subcommand deny_admin

This commit is contained in:
Werner Koch 2009-02-12 17:45:40 +00:00
parent 02890eedd8
commit 943f783de7
5 changed files with 16 additions and 5 deletions

6
NEWS
View File

@ -5,9 +5,9 @@ Noteworthy changes in version 2.0.11 (unreleased)
* SCDAEMON is now aware of the Geldkarte. * SCDAEMON is now aware of the Geldkarte.
* [gpgsm] The default cipher algorith is now again 3DES. This is due * The default cipher algorithm in GPGSM is now again 3DES. This is
to interoperability problems with Outlook 2003 which still can't due to interoperability problems with Outlook 2003 which still
cope with AES. can't cope with AES.
Noteworthy changes in version 2.0.10 (2009-01-12) Noteworthy changes in version 2.0.10 (2009-01-12)

View File

@ -48,7 +48,8 @@ Release process:
* Update the webpages - at least the file swdb.wml needs an update. * Update the webpages - at least the file swdb.wml needs an update.
* Add a new headline to NEWS. * Add a new headline to NEWS.
* Bump "my_version" up and set "my_issvn" back to "yes" in configure.ac * Bump "my_version" up and set "my_issvn" back to "yes" in configure.ac
* Write an announcement. * Write an announcement. Update https://savannah.gnu.org/projects/gnupg .

View File

@ -69,7 +69,7 @@ gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
$(other_libs) $(other_libs)
else else
# Note that we need to include all other libs here as well because # Note that we need to include all other libs here as well because
# some compilers don't care about inline fucntions and insert # some compilers don't care about inline functions and insert
# references to symbols used in unused inline functions. # references to symbols used in unused inline functions.
gpg2keys_curl_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS) gpg2keys_curl_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \ gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \

View File

@ -1,3 +1,7 @@
2009-02-12 Werner Koch <wk@g10code.com>
* command.c (cmd_getinfo): Add new subcommand "deny_admin".
2009-01-28 Werner Koch <wk@g10code.com> 2009-01-28 Werner Koch <wk@g10code.com>
* scdaemon.c (main): Make --allow-admin the default and make the * scdaemon.c (main): Make --allow-admin the default and make the

View File

@ -1557,6 +1557,10 @@ cmd_unlock (assuan_context_t ctx, char *line)
reader_list - Return a list of detected card readers. Does reader_list - Return a list of detected card readers. Does
currently only work with the internal CCID driver. currently only work with the internal CCID driver.
deny_admin - Returns OK if admin commands are not allowed or
GPG_ERR_GENERAL if admin commands are allowed.
*/ */
static int static int
@ -1622,6 +1626,8 @@ cmd_getinfo (assuan_context_t ctx, char *line)
rc = gpg_error (GPG_ERR_NO_DATA); rc = gpg_error (GPG_ERR_NO_DATA);
xfree (s); xfree (s);
} }
else if (!strcmp (line, "deny_admin"))
rc = opt.allow_admin? gpg_error (GPG_ERR_GENERAL) : 0;
else else
rc = set_error (GPG_ERR_ASS_PARAMETER, "unknown value for WHAT"); rc = set_error (GPG_ERR_ASS_PARAMETER, "unknown value for WHAT");
return rc; return rc;