[svn] GnuPG - r4929 - in trunk: . keyserver scd

[svn author wk]

Author: wk
Date: 2009-02-12 18:45:40 +0100 (Thu, 12 Feb 2009)
New Revision: 4929

Modified:
   trunk/NEWS
   trunk/README.maint
   trunk/keyserver/Makefile.am
   trunk/scd/ChangeLog
   trunk/scd/command.c
Log:
New scd getinfo subcommand deny_admin


Modified: trunk/scd/ChangeLog
===================================================================
--- trunk/scd/ChangeLog	2009-02-09 11:14:42 UTC (rev 4928)
+++ trunk/scd/ChangeLog	2009-02-12 17:45:40 UTC (rev 4929)
@@ -1,3 +1,7 @@
+2009-02-12  Werner Koch  <wk at g10code.com>
+
+	* command.c (cmd_getinfo): Add new subcommand "deny_admin".
+
 2009-01-28  Werner Koch  <wk at g10code.com>
 
 	* scdaemon.c (main): Make --allow-admin the default and make the

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2009-02-09 11:14:42 UTC (rev 4928)
+++ trunk/NEWS	2009-02-12 17:45:40 UTC (rev 4929)
@@ -5,9 +5,9 @@
 
  * SCDAEMON is now aware of the Geldkarte.
 
- * [gpgsm] The default cipher algorith is now again 3DES.  This is due
-   to interoperability problems with Outlook 2003 which still can't
-   cope with AES.
+ * The default cipher algorithm in GPGSM is now again 3DES.  This is
+   due to interoperability problems with Outlook 2003 which still
+   can't cope with AES.
 
 
 Noteworthy changes in version 2.0.10 (2009-01-12)

Modified: trunk/README.maint
===================================================================
--- trunk/README.maint	2009-02-09 11:14:42 UTC (rev 4928)
+++ trunk/README.maint	2009-02-12 17:45:40 UTC (rev 4929)
@@ -48,8 +48,9 @@
   * Update the webpages - at least the file swdb.wml needs an update.
   * Add a new headline to NEWS.
   * 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 .
 
 
 
 
+

Modified: trunk/keyserver/Makefile.am
===================================================================
--- trunk/keyserver/Makefile.am	2009-02-09 11:14:42 UTC (rev 4928)
+++ trunk/keyserver/Makefile.am	2009-02-12 17:45:40 UTC (rev 4929)
@@ -69,7 +69,7 @@
 	             $(other_libs) 
 else
 # 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.
 gpg2keys_curl_CPPFLAGS = $(LIBCURL_CPPFLAGS) $(AM_CPPFLAGS)
 gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \

Modified: trunk/scd/command.c
===================================================================
--- trunk/scd/command.c	2009-02-09 11:14:42 UTC (rev 4928)
+++ trunk/scd/command.c	2009-02-12 17:45:40 UTC (rev 4929)
@@ -1557,6 +1557,10 @@
 
    reader_list - Return a list of detected card readers.  Does
                  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
@@ -1622,6 +1626,8 @@
         rc = gpg_error (GPG_ERR_NO_DATA);
       xfree (s);
     }
+  else if (!strcmp (line, "deny_admin"))
+    rc = opt.allow_admin? gpg_error (GPG_ERR_GENERAL) : 0;
   else
     rc = set_error (GPG_ERR_ASS_PARAMETER, "unknown value for WHAT");
   return rc;