[svn] dirmngr - r336 - in trunk: . doc jnlib po src
svn author wk
cvs at cvs.gnupg.org
Tue Mar 9 14:42:03 CET 2010
Author: wk
Date: 2010-03-09 14:42:02 +0100 (Tue, 09 Mar 2010)
New Revision: 336
Modified:
trunk/AUTHORS
trunk/NEWS
trunk/README
trunk/configure.ac
trunk/doc/dirmngr.texi
trunk/jnlib/argparse.c
trunk/po/de.po
trunk/po/dirmngr.pot
trunk/src/ChangeLog
trunk/src/dirmngr-client.c
trunk/src/dirmngr.c
trunk/src/server.c
Log:
Preparing a release candidate.
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2009-12-22 13:02:09 UTC (rev 335)
+++ trunk/src/ChangeLog 2010-03-09 13:42:02 UTC (rev 336)
@@ -1,3 +1,7 @@
+2010-03-09 Werner Koch <wk at g10code.com>
+
+ * dirmngr.c (set_debug): Allow numerical values.
+
2009-12-15 Werner Koch <wk at g10code.com>
* dirmngr.c: Add option --ignore-cert-extension.
Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS 2009-12-22 13:02:09 UTC (rev 335)
+++ trunk/AUTHORS 2010-03-09 13:42:02 UTC (rev 336)
@@ -25,7 +25,7 @@
src/cdblib.h which are in the public domain.
- Copyright 2003, 2004, 2006, 2007, 2008 g10 Code GmbH
+ Copyright 2003, 2004, 2006, 2007, 2008, 2010 g10 Code GmbH
This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-12-22 13:02:09 UTC (rev 335)
+++ trunk/NEWS 2010-03-09 13:42:02 UTC (rev 336)
@@ -1,4 +1,4 @@
-Noteworthy changes in version 1.1.0
+Noteworthy changes in version 1.1.0 (unreleased)
------------------------------------------------
* Fixed a resource problem with LDAP CRLs.
Modified: trunk/README
===================================================================
--- trunk/README 2009-12-22 13:02:09 UTC (rev 335)
+++ trunk/README 2010-03-09 13:42:02 UTC (rev 336)
@@ -1,7 +1,7 @@
DirMngr - X.509 Directory Manager
-------------------------------------
- Version 1.0.3
+ Version 1.1.0
Intro
@@ -9,10 +9,10 @@
DirMngr is a server for managing and downloading certificate
revocation lists (CRLs) for X.509 certificates and for downloading
- the certificates themselves. Dirmngr also handles OCSP requests as
- an alternative to CRLs. Dirmngr is either invoked internaly by
- gpgsm (from gnupg 1.9) or when running as a system daemon through
- the dirmngr-client tool.
+ the certificates themselves. Dirmngr also handles OCSP requests
+ as an alternative to CRLs. Dirmngr is either invoked internally
+ by gpgsm (GnuPG-2) or when running as a system daemon through the
+ dirmngr-client tool.
See the file COPYING for copyright and warranty information. See
the file AUTHORS for contact addresses and code history.
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2009-12-22 13:02:09 UTC (rev 335)
+++ trunk/configure.ac 2010-03-09 13:42:02 UTC (rev 336)
@@ -27,8 +27,8 @@
# Remember to change the version number immediately *after* a release.
# Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [1.1.0])
-m4_define([my_issvn], [yes])
+m4_define([my_version], [1.1.0rc1])
+m4_define([my_issvn], [no])
m4_define([svn_revision], m4_esyscmd([printf "%d" $( (svn info 2>/dev/null \
|| echo 'Revision: 0')|sed -n '/^Revision:/ {s/[^0-9]//gp;q;}')]))
@@ -47,7 +47,7 @@
NEED_KSBA_API=1
NEED_KSBA_VERSION=1.0.2
-COPYRIGHT_YEAR_NAME="2009 g10 Code GmbH"
+COPYRIGHT_YEAR_NAME="2010 g10 Code GmbH"
PACKAGE=$PACKAGE_NAME
VERSION=$PACKAGE_VERSION
Modified: trunk/doc/dirmngr.texi
===================================================================
--- trunk/doc/dirmngr.texi 2009-12-22 13:02:09 UTC (rev 335)
+++ trunk/doc/dirmngr.texi 2010-03-09 13:42:02 UTC (rev 336)
@@ -347,20 +347,26 @@
@item --debug-level @var{level}
@opindex debug-level
-Select the debug level for investigating problems. @var{level} may be
-one of:
+Select the debug level for investigating problems. @var{level} may be a
+numeric value or by a keyword:
@table @code
@item none
-no debugging at all.
+No debugging at all. A value of less than 1 may be used instead of
+the keyword.
@item basic
-some basic debug messages
+Some basic debug messages. A value between 1 and 2 may be used
+instead of the keyword.
@item advanced
-more verbose debug messages
+More verbose debug messages. A value between 3 and 5 may be used
+instead of the keyword.
@item expert
-even more detailed messages
+Even more detailed messages. A value between 6 and 8 may be used
+instead of the keyword.
@item guru
-all of the debug messages you can get
+All of the debug messages you can get. A value greater than 8 may be
+used instead of the keyword. The creation of hash tracing files is
+only enabled if the keyword is used.
@end table
How these messages are mapped to the actual debugging flags is not
Modified: trunk/jnlib/argparse.c
===================================================================
--- trunk/jnlib/argparse.c 2009-12-22 13:02:09 UTC (rev 335)
+++ trunk/jnlib/argparse.c 2010-03-09 13:42:02 UTC (rev 336)
@@ -936,7 +936,7 @@
switch( level ) {
case 11: p = "foo"; break;
case 13: p = "0.0"; break;
- case 14: p = "Copyright (C) 2008 Free Software Foundation, Inc."; break;
+ case 14: p = "Copyright (C) 2010 Free Software Foundation, Inc."; break;
case 15: p =
"This program comes with ABSOLUTELY NO WARRANTY.\n"
"This is free software, and you are welcome to redistribute it\n"
Modified: trunk/po/de.po [not shown]
Modified: trunk/po/dirmngr.pot
===================================================================
--- trunk/po/dirmngr.pot 2009-12-22 13:02:09 UTC (rev 335)
+++ trunk/po/dirmngr.pot 2010-03-09 13:42:02 UTC (rev 336)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2009-07-31 14:26+0200\n"
+"POT-Creation-Date: 2010-03-09 13:10+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -51,7 +51,7 @@
msgid "can't access directory `%s': %s\n"
msgstr ""
-#: src/certcache.c:390 src/crlcache.c:2367 src/dirmngr.c:1458
+#: src/certcache.c:390 src/crlcache.c:2367 src/dirmngr.c:1479
#, c-format
msgid "can't open `%s': %s\n"
msgstr ""
@@ -109,7 +109,7 @@
msgid " runtime cached certificates: %u\n"
msgstr ""
-#: src/certcache.c:531 src/dirmngr-client.c:385
+#: src/certcache.c:531 src/dirmngr-client.c:384
msgid "certificate already cached\n"
msgstr ""
@@ -117,7 +117,7 @@
msgid "certificate cached\n"
msgstr ""
-#: src/certcache.c:535 src/certcache.c:555 src/dirmngr-client.c:389
+#: src/certcache.c:535 src/certcache.c:555 src/dirmngr-client.c:388
#, c-format
msgid "error caching certificate: %s\n"
msgstr ""
@@ -137,7 +137,7 @@
msgid "error fetching certificate by subject: %s\n"
msgstr ""
-#: src/certcache.c:1338 src/validate.c:445
+#: src/certcache.c:1338 src/validate.c:461
msgid "no issuer found in certificate\n"
msgstr ""
@@ -245,7 +245,7 @@
msgstr ""
#: src/crlcache.c:649 src/crlcache.c:654 src/crlcache.c:908 src/crlcache.c:914
-#: src/dirmngr.c:1404
+#: src/dirmngr.c:1425
#, c-format
msgid "error reading `%s': %s\n"
msgstr ""
@@ -406,7 +406,7 @@
msgid "error getting data from cache file: %s\n"
msgstr ""
-#: src/crlcache.c:1534 src/validate.c:868
+#: src/crlcache.c:1534 src/validate.c:884
#, c-format
msgid "unknown hash algorithm `%s'\n"
msgstr ""
@@ -606,7 +606,7 @@
msgid "End CRL dump\n"
msgstr ""
-#: src/crlcache.c:2376 src/crlfetch.c:213 src/ldap.c:685
+#: src/crlcache.c:2376 src/crlfetch.c:219 src/ldap.c:687
#, c-format
msgid "error initializing reader object: %s\n"
msgstr ""
@@ -630,189 +630,189 @@
msgid "reader to file mapping table full - waiting\n"
msgstr ""
-#: src/crlfetch.c:172
+#: src/crlfetch.c:178
msgid "using \"http\" instead of \"https\"\n"
msgstr ""
-#: src/crlfetch.c:183 src/crlfetch.c:278 src/crlfetch.c:298 src/crlfetch.c:316
+#: src/crlfetch.c:189 src/crlfetch.c:284 src/crlfetch.c:304 src/crlfetch.c:322
#, c-format
msgid "CRL access not possible due to disabled %s\n"
msgstr ""
-#: src/crlfetch.c:238 src/ocsp.c:212
+#: src/crlfetch.c:244 src/ocsp.c:212
#, c-format
msgid "URL `%s' redirected to `%s' (%u)\n"
msgstr ""
-#: src/crlfetch.c:257 src/ocsp.c:229
+#: src/crlfetch.c:263 src/ocsp.c:229
msgid "too many redirections\n"
msgstr ""
-#: src/crlfetch.c:263
+#: src/crlfetch.c:269
#, c-format
msgid "error retrieving `%s': %s\n"
msgstr ""
-#: src/crlfetch.c:268
+#: src/crlfetch.c:274
#, c-format
msgid "error retrieving `%s': http status %u\n"
msgstr ""
-#: src/crlfetch.c:330
+#: src/crlfetch.c:336
#, c-format
msgid "certificate search not possible due to disabled %s\n"
msgstr ""
-#: src/dirmngr.c:123
+#: src/dirmngr.c:124
msgid ""
"@Commands:\n"
" "
msgstr ""
-#: src/dirmngr.c:125
+#: src/dirmngr.c:126
msgid "run in server mode (foreground)"
msgstr ""
-#: src/dirmngr.c:126
+#: src/dirmngr.c:127
msgid "run in daemon mode (background)"
msgstr ""
-#: src/dirmngr.c:128
+#: src/dirmngr.c:129
msgid "run as windows service (background)"
msgstr ""
-#: src/dirmngr.c:130
+#: src/dirmngr.c:131
msgid "list the contents of the CRL cache"
msgstr ""
-#: src/dirmngr.c:131
+#: src/dirmngr.c:132
msgid "|FILE|load CRL from FILE into cache"
msgstr ""
-#: src/dirmngr.c:132
+#: src/dirmngr.c:133
msgid "|URL|fetch a CRL from URL"
msgstr ""
-#: src/dirmngr.c:133
+#: src/dirmngr.c:134
msgid "shutdown the dirmngr"
msgstr ""
-#: src/dirmngr.c:134
+#: src/dirmngr.c:135
msgid "flush the cache"
msgstr ""
-#: src/dirmngr.c:138
+#: src/dirmngr.c:139
msgid ""
"@\n"
"Options:\n"
" "
msgstr ""
-#: src/dirmngr.c:140 src/dirmngr-client.c:69 src/dirmngr_ldap.c:85
+#: src/dirmngr.c:141 src/dirmngr-client.c:69 src/dirmngr_ldap.c:85
msgid "verbose"
msgstr ""
-#: src/dirmngr.c:141 src/dirmngr-client.c:70 src/dirmngr_ldap.c:86
+#: src/dirmngr.c:142 src/dirmngr-client.c:70 src/dirmngr_ldap.c:86
msgid "be somewhat more quiet"
msgstr ""
-#: src/dirmngr.c:142
+#: src/dirmngr.c:143
msgid "sh-style command output"
msgstr ""
-#: src/dirmngr.c:143
+#: src/dirmngr.c:144
msgid "csh-style command output"
msgstr ""
-#: src/dirmngr.c:144
+#: src/dirmngr.c:145
msgid "|FILE|read options from FILE"
msgstr ""
-#: src/dirmngr.c:146
+#: src/dirmngr.c:147
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: src/dirmngr.c:147
+#: src/dirmngr.c:148
msgid "do not detach from the console"
msgstr ""
-#: src/dirmngr.c:148
+#: src/dirmngr.c:149
msgid "|FILE|write server mode logs to FILE"
msgstr ""
-#: src/dirmngr.c:149
+#: src/dirmngr.c:150
msgid "run without asking a user"
msgstr ""
-#: src/dirmngr.c:150
+#: src/dirmngr.c:151
msgid "force loading of outdated CRLs"
msgstr ""
-#: src/dirmngr.c:151
+#: src/dirmngr.c:152
msgid "allow sending OCSP requests"
msgstr ""
-#: src/dirmngr.c:152
+#: src/dirmngr.c:153
msgid "inhibit the use of HTTP"
msgstr ""
-#: src/dirmngr.c:153
+#: src/dirmngr.c:154
msgid "inhibit the use of LDAP"
msgstr ""
-#: src/dirmngr.c:155
+#: src/dirmngr.c:156
msgid "ignore HTTP CRL distribution points"
msgstr ""
-#: src/dirmngr.c:157
+#: src/dirmngr.c:158
msgid "ignore LDAP CRL distribution points"
msgstr ""
-#: src/dirmngr.c:159
+#: src/dirmngr.c:160
msgid "ignore certificate contained OCSP service URLs"
msgstr ""
-#: src/dirmngr.c:165
+#: src/dirmngr.c:166
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
-#: src/dirmngr.c:167
+#: src/dirmngr.c:168
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
-#: src/dirmngr.c:169
+#: src/dirmngr.c:170
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
-#: src/dirmngr.c:172
+#: src/dirmngr.c:173
msgid "|FILE|read LDAP server list from FILE"
msgstr ""
-#: src/dirmngr.c:174
+#: src/dirmngr.c:175
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
-#: src/dirmngr.c:176 src/dirmngr_ldap.c:87
+#: src/dirmngr.c:177 src/dirmngr_ldap.c:87
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
-#: src/dirmngr.c:178
+#: src/dirmngr.c:179
msgid "|URL|use OCSP responder at URL"
msgstr ""
-#: src/dirmngr.c:179
+#: src/dirmngr.c:180
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
-#: src/dirmngr.c:185
+#: src/dirmngr.c:186
msgid "|N|do not return more than N items in one query"
msgstr ""
-#: src/dirmngr.c:187
+#: src/dirmngr.c:188
msgid "|FILE|listen on socket FILE"
msgstr ""
-#: src/dirmngr.c:200
+#: src/dirmngr.c:201
msgid ""
"@\n"
"(See the \"info\" manual for a complete listing of all commands and "
@@ -822,285 +822,285 @@
#. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
#. reporting address. This is so that we can change the
#. reporting address without breaking the translations.
-#: src/dirmngr.c:273 src/dirmngr-client.c:149 src/dirmngr_ldap.c:148
+#: src/dirmngr.c:275 src/dirmngr-client.c:149 src/dirmngr_ldap.c:148
msgid "Please report bugs to <@EMAIL@>.\n"
msgstr ""
-#: src/dirmngr.c:276
+#: src/dirmngr.c:278
msgid "Usage: dirmngr [options] (-h for help)"
msgstr ""
-#: src/dirmngr.c:278
+#: src/dirmngr.c:280
msgid ""
"Syntax: dirmngr [options] [command [args]]\n"
"LDAP and OCSP access for GnuPG\n"
msgstr ""
-#: src/dirmngr.c:353
+#: src/dirmngr.c:366
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: src/dirmngr.c:354
+#: src/dirmngr.c:367
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
-#: src/dirmngr.c:392
+#: src/dirmngr.c:405
msgid "usage: dirmngr [options] "
msgstr ""
-#: src/dirmngr.c:417
+#: src/dirmngr.c:430
#, c-format
msgid "error spawning ldap wrapper reaper thread: %s\n"
msgstr ""
-#: src/dirmngr.c:638 src/dirmngr.c:648
+#: src/dirmngr.c:657 src/dirmngr.c:667
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: src/dirmngr.c:760
+#: src/dirmngr.c:783
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr ""
-#: src/dirmngr.c:765 src/dirmngr.c:1564
+#: src/dirmngr.c:788 src/dirmngr.c:1585
#, c-format
msgid "option file `%s': %s\n"
msgstr ""
-#: src/dirmngr.c:773
+#: src/dirmngr.c:796
#, c-format
msgid "reading options from `%s'\n"
msgstr ""
-#: src/dirmngr.c:875
+#: src/dirmngr.c:898
#, c-format
msgid "WARNING: running with faked system time %s\n"
msgstr ""
-#: src/dirmngr.c:958
+#: src/dirmngr.c:979
msgid "colons are not allowed in the socket name\n"
msgstr ""
-#: src/dirmngr.c:964
+#: src/dirmngr.c:985
msgid "name of socket too long\n"
msgstr ""
-#: src/dirmngr.c:971
+#: src/dirmngr.c:992
#, c-format
msgid "can't create socket: %s\n"
msgstr ""
-#: src/dirmngr.c:990
+#: src/dirmngr.c:1011
msgid "error getting nonce for the socket\n"
msgstr ""
-#: src/dirmngr.c:993
+#: src/dirmngr.c:1014
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr ""
-#: src/dirmngr.c:1002
+#: src/dirmngr.c:1023
#, c-format
msgid "listen() failed: %s\n"
msgstr ""
-#: src/dirmngr.c:1008
+#: src/dirmngr.c:1029
#, c-format
msgid "listening on socket `%s'\n"
msgstr ""
-#: src/dirmngr.c:1019
+#: src/dirmngr.c:1040
#, c-format
msgid "fork failed: %s\n"
msgstr ""
-#: src/dirmngr.c:1037
+#: src/dirmngr.c:1058
msgid "out of core\n"
msgstr ""
-#: src/dirmngr.c:1076
+#: src/dirmngr.c:1097
#, c-format
msgid "setsid() failed: %s\n"
msgstr ""
-#: src/dirmngr.c:1086
+#: src/dirmngr.c:1107
#, c-format
msgid "chdir to / failed: %s\n"
msgstr ""
-#: src/dirmngr.c:1156 src/server.c:1102
+#: src/dirmngr.c:1177 src/server.c:1103
#, c-format
msgid "fetching CRL from `%s' failed: %s\n"
msgstr ""
-#: src/dirmngr.c:1162 src/server.c:1108
+#: src/dirmngr.c:1183 src/server.c:1109
#, c-format
msgid "processing CRL from `%s' failed: %s\n"
msgstr ""
-#: src/dirmngr.c:1366
+#: src/dirmngr.c:1387
#, c-format
msgid "error opening `%s': %s\n"
msgstr ""
-#: src/dirmngr.c:1381
+#: src/dirmngr.c:1402
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr ""
-#: src/dirmngr.c:1436 src/dirmngr.c:1520
+#: src/dirmngr.c:1457 src/dirmngr.c:1541
#, c-format
msgid "%s:%u: invalid fingerprint detected\n"
msgstr ""
-#: src/dirmngr.c:1472 src/dirmngr.c:1498
+#: src/dirmngr.c:1493 src/dirmngr.c:1519
#, c-format
msgid "%s:%u: read error: %s\n"
msgstr ""
-#: src/dirmngr.c:1527
+#: src/dirmngr.c:1548
#, c-format
msgid "%s:%u: garbage at end of line ignored\n"
msgstr ""
-#: src/dirmngr.c:1597
+#: src/dirmngr.c:1618
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
-#: src/dirmngr.c:1611
+#: src/dirmngr.c:1632
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
-#: src/dirmngr.c:1616 src/dirmngr.c:1653
+#: src/dirmngr.c:1637 src/dirmngr.c:1674
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
-#: src/dirmngr.c:1618
+#: src/dirmngr.c:1639
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
-#: src/dirmngr.c:1623 src/dirmngr.c:1656
+#: src/dirmngr.c:1644 src/dirmngr.c:1677
msgid "shutdown forced\n"
msgstr ""
-#: src/dirmngr.c:1631
+#: src/dirmngr.c:1652
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
-#: src/dirmngr.c:1638
+#: src/dirmngr.c:1659
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
-#: src/dirmngr.c:1672
+#: src/dirmngr.c:1693
#, c-format
msgid "error reading nonce on fd %d: %s\n"
msgstr ""
-#: src/dirmngr.c:1697
+#: src/dirmngr.c:1718
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: src/dirmngr.c:1702
+#: src/dirmngr.c:1723
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: src/dirmngr.c:1785
+#: src/dirmngr.c:1806
#, c-format
msgid "accept failed: %s - waiting 1s\n"
msgstr ""
-#: src/dirmngr.c:1811
+#: src/dirmngr.c:1832
#, c-format
msgid "error spawning connection handler: %s\n"
msgstr ""
-#: src/http.c:1471
+#: src/http.c:1505
#, c-format
msgid "error creating socket: %s\n"
msgstr ""
-#: src/http.c:1515
+#: src/http.c:1549
msgid "host not found"
msgstr ""
-#: src/ldap.c:146
+#: src/ldap.c:149
#, c-format
msgid "invalid char 0x%02x in host name - not added\n"
msgstr ""
-#: src/ldap.c:150
+#: src/ldap.c:153
#, c-format
msgid "adding `%s:%d' to the ldap server list\n"
msgstr ""
-#: src/ldap.c:153 src/misc.c:745
+#: src/ldap.c:156 src/misc.c:745
#, c-format
msgid "malloc failed: %s\n"
msgstr ""
-#: src/ldap.c:233
+#: src/ldap.c:234
#, c-format
msgid "error printing log line: %s\n"
msgstr ""
-#: src/ldap.c:270
+#: src/ldap.c:263
#, c-format
-msgid "pth_event failed: %s\n"
+msgid "error reading log from ldap wrapper %d: %s\n"
msgstr ""
-#: src/ldap.c:290
+#: src/ldap.c:301
#, c-format
-msgid "pth_wait failed: %s\n"
+msgid "pth_event failed: %s\n"
msgstr ""
-#: src/ldap.c:320
+#: src/ldap.c:321
#, c-format
-msgid "error reading log from ldap wrapper %d: %s\n"
+msgid "pth_wait failed: %s\n"
msgstr ""
-#: src/ldap.c:352
+#: src/ldap.c:358
#, c-format
msgid "ldap wrapper %d ready: timeout\n"
msgstr ""
-#: src/ldap.c:353
+#: src/ldap.c:359
#, c-format
msgid "ldap wrapper %d ready"
msgstr ""
-#: src/ldap.c:361
+#: src/ldap.c:367
#, c-format
msgid "waiting for ldap wrapper %d failed: %s\n"
msgstr ""
-#: src/ldap.c:373
+#: src/ldap.c:379
#, c-format
msgid "ldap wrapper %d stalled - killing\n"
msgstr ""
-#: src/ldap.c:462 src/ldap.c:483
+#: src/ldap.c:466 src/ldap.c:487
#, c-format
msgid "reading from ldap wrapper %d failed: %s\n"
msgstr ""
-#: src/ldap.c:652
+#: src/ldap.c:654
#, c-format
msgid "error allocating memory: %s\n"
msgstr ""
-#: src/ldap.c:1218
+#: src/ldap.c:1220
#, c-format
msgid "start_cert_fetch: invalid pattern `%s'\n"
msgstr ""
-#: src/ldap.c:1424
+#: src/ldap.c:1426
msgid "ldap_search hit the size limit of the server\n"
msgstr ""
@@ -1202,7 +1202,7 @@
msgid "no suitable certificate found to verify the OCSP response\n"
msgstr ""
-#: src/ocsp.c:551 src/validate.c:609
+#: src/ocsp.c:551 src/validate.c:625
#, c-format
msgid "issuer certificate not found: %s\n"
msgstr ""
@@ -1296,46 +1296,46 @@
msgid "assuan_inquire(%s) failed: %s\n"
msgstr ""
-#: src/server.c:451
+#: src/server.c:455
msgid "ldapserver missing"
msgstr ""
-#: src/server.c:522
+#: src/server.c:525
msgid "serialno missing in cert ID"
msgstr ""
-#: src/server.c:575 src/server.c:689 src/server.c:774 src/server.c:1069
-#: src/server.c:1129 src/server.c:1155 src/server.c:1208 src/server.c:1277
+#: src/server.c:578 src/server.c:692 src/server.c:777 src/server.c:1070
+#: src/server.c:1130 src/server.c:1155 src/server.c:1208 src/server.c:1277
#, c-format
msgid "command %s failed: %s\n"
msgstr ""
-#: src/server.c:660 src/server.c:748 src/server.c:1188 src/server.c:1241
+#: src/server.c:663 src/server.c:751 src/server.c:1188 src/server.c:1241
#, c-format
msgid "assuan_inquire failed: %s\n"
msgstr ""
-#: src/server.c:793
+#: src/server.c:796
#, c-format
msgid "fetch_cert_by_url failed: %s\n"
msgstr ""
-#: src/server.c:805 src/server.c:836 src/server.c:992
+#: src/server.c:808 src/server.c:839 src/server.c:995
#, c-format
msgid "error sending data: %s\n"
msgstr ""
-#: src/server.c:940
+#: src/server.c:943
#, c-format
msgid "start_cert_fetch failed: %s\n"
msgstr ""
-#: src/server.c:973
+#: src/server.c:976
#, c-format
msgid "fetch_next_cert failed: %s\n"
msgstr ""
-#: src/server.c:1000
+#: src/server.c:1003
#, c-format
msgid "max_replies %d exceeded\n"
msgstr ""
@@ -1344,166 +1344,166 @@
msgid "no data stream"
msgstr ""
-#: src/server.c:1343
+#: src/server.c:1346
#, c-format
msgid "can't allocate control structure: %s\n"
msgstr ""
-#: src/server.c:1366
+#: src/server.c:1378
#, c-format
msgid "failed to initialize the server: %s\n"
msgstr ""
-#: src/server.c:1374
+#: src/server.c:1386
#, c-format
msgid "failed to the register commands with Assuan: %s\n"
msgstr ""
-#: src/server.c:1417
+#: src/server.c:1429
#, c-format
msgid "Assuan accept problem: %s\n"
msgstr ""
-#: src/server.c:1437
+#: src/server.c:1448
#, c-format
msgid "Assuan processing failed: %s\n"
msgstr ""
-#: src/validate.c:93
+#: src/validate.c:109
#, c-format
msgid "critical certificate extension %s is not supported"
msgstr ""
-#: src/validate.c:153
+#: src/validate.c:169
msgid "note: non-critical certificate policy not allowed"
msgstr ""
-#: src/validate.c:158
+#: src/validate.c:174
msgid "certificate policy not allowed"
msgstr ""
-#: src/validate.c:187
+#: src/validate.c:203
msgid "accepting root CA not marked as a CA"
msgstr ""
-#: src/validate.c:191
+#: src/validate.c:207
msgid "issuer certificate is not marked as a CA"
msgstr ""
-#: src/validate.c:213
+#: src/validate.c:229
msgid "CRL checking too deeply nested\n"
msgstr ""
-#: src/validate.c:231
+#: src/validate.c:247
msgid "not checking CRL for"
msgstr ""
-#: src/validate.c:236
+#: src/validate.c:252
msgid "checking CRL for"
msgstr ""
-#: src/validate.c:374
+#: src/validate.c:390
msgid "running in compatibility mode - certificate chain not checked!\n"
msgstr ""
-#: src/validate.c:459
+#: src/validate.c:475
#, c-format
msgid "certificate with invalid validity: %s"
msgstr ""
-#: src/validate.c:477
+#: src/validate.c:493
msgid "certificate not yet valid"
msgstr ""
-#: src/validate.c:488
+#: src/validate.c:504
msgid "certificate has expired"
msgstr ""
-#: src/validate.c:518
+#: src/validate.c:534
msgid "selfsigned certificate has a BAD signature"
msgstr ""
-#: src/validate.c:536
+#: src/validate.c:552
msgid "root certificate is not marked trusted"
msgstr ""
-#: src/validate.c:538
+#: src/validate.c:554
#, c-format
msgid "fingerprint=%s\n"
msgstr ""
-#: src/validate.c:551
+#: src/validate.c:567
#, c-format
msgid "checking trustworthiness of root certificate failed: %s\n"
msgstr ""
-#: src/validate.c:591
+#: src/validate.c:607
msgid "certificate chain too long\n"
msgstr ""
-#: src/validate.c:603
+#: src/validate.c:619
msgid "issuer certificate not found"
msgstr ""
-#: src/validate.c:629
+#: src/validate.c:645
msgid "certificate has a BAD signature"
msgstr ""
-#: src/validate.c:653
+#: src/validate.c:669
msgid "found another possible matching CA certificate - trying again"
msgstr ""
-#: src/validate.c:678
+#: src/validate.c:694
#, c-format
msgid "certificate chain longer than allowed by CA (%d)"
msgstr ""
-#: src/validate.c:708
+#: src/validate.c:724
msgid "certificate is good\n"
msgstr ""
-#: src/validate.c:728
+#: src/validate.c:744
msgid "certificate chain is good\n"
msgstr ""
-#: src/validate.c:958
+#: src/validate.c:974
msgid "DSA requires the use of a 160 bit hash algorithm\n"
msgstr ""
-#: src/validate.c:1065
+#: src/validate.c:1081
msgid "no key usage specified - assuming all usages\n"
msgstr ""
-#: src/validate.c:1075
+#: src/validate.c:1091
#, c-format
msgid "error getting key usage information: %s\n"
msgstr ""
-#: src/validate.c:1085
+#: src/validate.c:1101
msgid "certificate should have not been used for certification\n"
msgstr ""
-#: src/validate.c:1097
+#: src/validate.c:1113
msgid "certificate should have not been used for OCSP response signing\n"
msgstr ""
-#: src/validate.c:1106
+#: src/validate.c:1122
msgid "certificate should have not been used for CRL signing\n"
msgstr ""
-#: src/validate.c:1117
+#: src/validate.c:1133
msgid "certificate should have not been used for encryption\n"
msgstr ""
-#: src/validate.c:1119
+#: src/validate.c:1135
msgid "certificate should have not been used for signing\n"
msgstr ""
-#: src/validate.c:1120
+#: src/validate.c:1136
msgid "certificate is not usable for encryption\n"
msgstr ""
-#: src/validate.c:1121
+#: src/validate.c:1137
msgid "certificate is not usable for signing\n"
msgstr ""
@@ -1563,98 +1563,103 @@
"not valid and other error codes for general failures\n"
msgstr ""
-#: src/dirmngr-client.c:285 src/dirmngr-client.c:1004
+#: src/dirmngr-client.c:284 src/dirmngr-client.c:1013
#, c-format
msgid "error reading certificate from stdin: %s\n"
msgstr ""
-#: src/dirmngr-client.c:292
+#: src/dirmngr-client.c:291
#, c-format
msgid "error reading certificate from `%s': %s\n"
msgstr ""
-#: src/dirmngr-client.c:306
+#: src/dirmngr-client.c:305
msgid "certificate too large to make any sense\n"
msgstr ""
-#: src/dirmngr-client.c:332
+#: src/dirmngr-client.c:331
#, c-format
msgid "lookup failed: %s\n"
msgstr ""
-#: src/dirmngr-client.c:347
+#: src/dirmngr-client.c:346
#, c-format
msgid "loading CRL `%s' failed: %s\n"
msgstr ""
-#: src/dirmngr-client.c:375
+#: src/dirmngr-client.c:374
msgid "a dirmngr daemon is up and running\n"
msgstr ""
-#: src/dirmngr-client.c:397
+#: src/dirmngr-client.c:396
#, c-format
msgid "validation of certificate failed: %s\n"
msgstr ""
-#: src/dirmngr-client.c:404 src/dirmngr-client.c:1015
+#: src/dirmngr-client.c:403 src/dirmngr-client.c:1024
msgid "certificate is valid\n"
msgstr ""
-#: src/dirmngr-client.c:410 src/dirmngr-client.c:1023
+#: src/dirmngr-client.c:409 src/dirmngr-client.c:1032
msgid "certificate has been revoked\n"
msgstr ""
-#: src/dirmngr-client.c:415 src/dirmngr-client.c:1025
+#: src/dirmngr-client.c:414 src/dirmngr-client.c:1034
#, c-format
msgid "certificate check failed: %s\n"
msgstr ""
-#: src/dirmngr-client.c:428
+#: src/dirmngr-client.c:427
#, c-format
msgid "got status: `%s'\n"
msgstr ""
-#: src/dirmngr-client.c:443
+#: src/dirmngr-client.c:442
#, c-format
msgid "error writing base64 encoding: %s\n"
msgstr ""
-#: src/dirmngr-client.c:475
+#: src/dirmngr-client.c:469
+#, c-format
+msgid "failed to allocate assuan context: %s\n"
+msgstr ""
+
+#: src/dirmngr-client.c:483
msgid "apparently no running dirmngr\n"
msgstr ""
-#: src/dirmngr-client.c:480
+#: src/dirmngr-client.c:488
msgid "no running dirmngr - starting one\n"
msgstr ""
-#: src/dirmngr-client.c:513
+#: src/dirmngr-client.c:521
msgid "malformed DIRMNGR_INFO environment variable\n"
msgstr ""
-#: src/dirmngr-client.c:528
+#: src/dirmngr-client.c:536
#, c-format
msgid "dirmngr protocol version %d is not supported\n"
msgstr ""
-#: src/dirmngr-client.c:544
+#: src/dirmngr-client.c:552
msgid "can't connect to the dirmngr - trying fall back\n"
msgstr ""
-#: src/dirmngr-client.c:552
+#: src/dirmngr-client.c:561
#, c-format
msgid "can't connect to the dirmngr: %s\n"
msgstr ""
-#: src/dirmngr-client.c:801
+#: src/dirmngr-client.c:810
#, c-format
msgid "unsupported inquiry `%s'\n"
msgstr ""
-#: src/dirmngr-client.c:903
+#: src/dirmngr-client.c:912
msgid "absolute file name expected\n"
msgstr ""
-#: src/dirmngr-client.c:948
+#: src/dirmngr-client.c:957
#, c-format
msgid "looking up `%s'\n"
msgstr ""
Modified: trunk/src/dirmngr-client.c
===================================================================
--- trunk/src/dirmngr-client.c 2009-12-22 13:02:09 UTC (rev 335)
+++ trunk/src/dirmngr-client.c 2010-03-09 13:42:02 UTC (rev 336)
@@ -466,7 +466,8 @@
rc = assuan_new (&ctx);
if (rc)
{
- log_error (_("can't create assuan context: %s\n"), gpg_strerror (rc));
+ log_error (_("failed to allocate assuan context: %s\n"),
+ gpg_strerror (rc));
return NULL;
}
Modified: trunk/src/dirmngr.c
===================================================================
--- trunk/src/dirmngr.c 2009-12-22 13:02:09 UTC (rev 335)
+++ trunk/src/dirmngr.c 2010-03-09 13:42:02 UTC (rev 336)
@@ -1,6 +1,6 @@
/* dirmngr.c - LDAP access
* Copyright (C) 2002 Klarälvdalens Datakonsult AB
- * Copyright (C) 2003, 2004, 2006, 2007, 2008 g10 Code GmbH
+ * Copyright (C) 2003, 2004, 2006, 2007, 2008, 2010 g10 Code GmbH
*
* This file is part of DirMngr.
*
@@ -337,19 +337,30 @@
static void
set_debug (void)
{
+ int numok = (debug_level && digitp (debug_level));
+ int numlvl = numok? atoi (debug_level) : 0;
+
if (!debug_level)
;
- else if (!strcmp (debug_level, "none"))
+ else if (!strcmp (debug_level, "none") || (numok && numlvl < 1))
opt.debug = 0;
- else if (!strcmp (debug_level, "basic"))
+ else if (!strcmp (debug_level, "basic") || (numok && numlvl <= 2))
opt.debug = DBG_ASSUAN_VALUE;
- else if (!strcmp (debug_level, "advanced"))
+ else if (!strcmp (debug_level, "advanced") || (numok && numlvl <= 5))
opt.debug = (DBG_ASSUAN_VALUE|DBG_X509_VALUE|DBG_LOOKUP_VALUE);
- else if (!strcmp (debug_level, "expert"))
+ else if (!strcmp (debug_level, "expert") || (numok && numlvl <= 8))
opt.debug = (DBG_ASSUAN_VALUE|DBG_X509_VALUE|DBG_LOOKUP_VALUE
|DBG_CACHE_VALUE|DBG_CRYPTO_VALUE);
- else if (!strcmp (debug_level, "guru"))
- opt.debug = ~0;
+ else if (!strcmp (debug_level, "guru") || numok)
+ {
+ opt.debug = ~0;
+ /* Unless the "guru" string has been used we don't want to allow
+ hashing debugging. The rationale is that people tend to
+ select the highest debug value and would then clutter their
+ disk with debug files which may reveal confidential data. */
+ if (numok)
+ opt.debug &= ~(DBG_HASHING_VALUE);
+ }
else
{
log_error (_("invalid debug-level `%s' given\n"), debug_level);
Modified: trunk/src/server.c
===================================================================
--- trunk/src/server.c 2009-12-22 13:02:09 UTC (rev 335)
+++ trunk/src/server.c 2010-03-09 13:42:02 UTC (rev 336)
@@ -1354,7 +1354,7 @@
rc = assuan_new (&ctx);
if (rc)
{
- log_error (_("failed to allocate assuan context: %s\n"),
+ log_error (_(),
gpg_strerror (rc));
dirmngr_exit (2);
}
More information about the Gnupg-commits
mailing list