dirmngr (6 files)
cvs user wk
cvs at cvs.gnupg.org
Wed Nov 24 15:37:15 CET 2004
Date: Wednesday, November 24, 2004 @ 15:44:01
Author: wk
Path: /cvs/dirmngr/dirmngr
Modified: po/de.po po/dirmngr.pot src/ChangeLog src/dirmngr.c
src/dirmngr.h src/ocsp.c
Add option --ignore-ocsp-service-url
----------------+
po/de.po | 158 ++++++++++++++++++++++++++++---------------------------
po/dirmngr.pot | 156 +++++++++++++++++++++++++++---------------------------
src/ChangeLog | 4 +
src/dirmngr.c | 9 ++-
src/dirmngr.h | 2
src/ocsp.c | 2
6 files changed, 174 insertions(+), 157 deletions(-)
Index: dirmngr/po/de.po
diff -u dirmngr/po/de.po:1.7 dirmngr/po/de.po:1.8
--- dirmngr/po/de.po:1.7 Wed Nov 24 13:25:53 2004
+++ dirmngr/po/de.po Wed Nov 24 15:44:01 2004
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: dirmngr 0.9.0\n"
"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2004-11-24 13:16+0100\n"
-"PO-Revision-Date: 2004-11-24 13:16+0100\n"
+"POT-Creation-Date: 2004-11-24 15:35+0100\n"
+"PO-Revision-Date: 2004-11-24 15:37+0100\n"
"Last-Translator: Werner Koch <wk at g10code.com>\n"
"Language-Team: de\n"
"MIME-Version: 1.0\n"
@@ -205,7 +205,7 @@
msgid "unsupported record type in `%s' line %u skipped\n"
msgstr "Nicht unterstützter Datensatztyp in `%s', Zeile %u übergangen\n"
-#: src/crlcache.c:574 src/crlcache.c:803 src/dirmngr.c:1191
+#: src/crlcache.c:574 src/crlcache.c:803 src/dirmngr.c:1196
#, c-format
msgid "error reading `%s': %s\n"
msgstr "Fehler beim Lesen von `%s': %s\n"
@@ -627,7 +627,7 @@
msgid "Certificate search not possible due to disabled %s\n"
msgstr "Zertifikatsuche ist nicht möglich da %s abgeschaltet ist\n"
-#: src/dirmngr.c:105
+#: src/dirmngr.c:106
msgid ""
"@Commands:\n"
" "
@@ -635,35 +635,35 @@
"@Kommandos:\n"
" "
-#: src/dirmngr.c:107
+#: src/dirmngr.c:108
msgid "run in server mode (foreground)"
msgstr "Im Servermodus ausführen (Vordergrund)"
-#: src/dirmngr.c:108
+#: src/dirmngr.c:109
msgid "run in daemon mode (background)"
msgstr "Im Daemonmodus ausführen (Hintergrund)"
-#: src/dirmngr.c:109
+#: src/dirmngr.c:110
msgid "list the contents of the CRL cache"
msgstr "Den Inhalt des CRL Caches anzeigen"
-#: src/dirmngr.c:110
+#: src/dirmngr.c:111
msgid "|FILE|load CRL from FILE into cache"
msgstr "|DATEI|Lade die CRL aus der DATEI in den Cache"
-#: src/dirmngr.c:111
+#: src/dirmngr.c:112
msgid "|URL|fetch a CRL from URL"
msgstr "|URL|Hole eine CRL von dieser URL"
-#: src/dirmngr.c:112
+#: src/dirmngr.c:113
msgid "shutdown the dirmngr"
msgstr "Den Dirmngr herunterfahren"
-#: src/dirmngr.c:113
+#: src/dirmngr.c:114
msgid "flush the cache"
msgstr "Den Cache löschen"
-#: src/dirmngr.c:116
+#: src/dirmngr.c:117
msgid ""
"@\n"
"Options:\n"
@@ -673,115 +673,119 @@
"Optionen:\n"
" "
-#: src/dirmngr.c:118 src/dirmngr-client.c:64 src/dirmngr_ldap.c:73
+#: src/dirmngr.c:119 src/dirmngr-client.c:64 src/dirmngr_ldap.c:73
msgid "verbose"
msgstr "ausführlich"
-#: src/dirmngr.c:119 src/dirmngr-client.c:65 src/dirmngr_ldap.c:74
+#: src/dirmngr.c:120 src/dirmngr-client.c:65 src/dirmngr_ldap.c:74
msgid "be somewhat more quiet"
msgstr "etwas weniger Ausgaben erzeugen"
-#: src/dirmngr.c:120
+#: src/dirmngr.c:121
msgid "sh-style command output"
msgstr "Kommandausgabe für /bin/sh"
-#: src/dirmngr.c:121
+#: src/dirmngr.c:122
msgid "csh-style command output"
msgstr "Kommandausgabe für /bin/csh"
-#: src/dirmngr.c:122
+#: src/dirmngr.c:123
msgid "|FILE|read options from FILE"
msgstr "|DATEI|Lese Optionen aus DATEI"
-#: src/dirmngr.c:124
+#: src/dirmngr.c:125
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr "|NAME|Setze die Debugebene auf NAME"
-#: src/dirmngr.c:125
+#: src/dirmngr.c:126
msgid "do not detach from the console"
msgstr "Nicht von der Konsole loslösen"
-#: src/dirmngr.c:126
+#: src/dirmngr.c:127
msgid "|FILE|write logs to FILE"
msgstr "|DATEI|Schreibe Logs in DATEI"
-#: src/dirmngr.c:127
+#: src/dirmngr.c:128
msgid "run without asking a user"
msgstr "Ausführung ohne Benutzernachfrage"
-#: src/dirmngr.c:128
+#: src/dirmngr.c:129
msgid "force loading of outdated CRLs"
msgstr "Laden von abgelaufenen CRLs erzwingen"
-#: src/dirmngr.c:129
+#: src/dirmngr.c:130
msgid "allow sending OCSP requests"
msgstr "OCSP Anfragen erlauben"
-#: src/dirmngr.c:130
+#: src/dirmngr.c:131
msgid "inhibit the use of HTTP"
msgstr "Sperre die Benutzung von HTTP"
-#: src/dirmngr.c:131
+#: src/dirmngr.c:132
msgid "inhibit the use of LDAP"
msgstr "Sperre die Benutzung von LDAP"
-#: src/dirmngr.c:133
+#: src/dirmngr.c:134
msgid "ignore HTTP CRL distribution points"
msgstr "Ãœbergehe HTTP CRL Distribution Points"
-#: src/dirmngr.c:135
+#: src/dirmngr.c:136
msgid "ignore LDAP CRL distribution points"
msgstr "Ãœbergehe LDAP CRL Distribution Points"
-#: src/dirmngr.c:137
+#: src/dirmngr.c:138
+msgid "ignore certificate contained OCSP service URLs"
+msgstr "Ãœbergehe im Zertifikat enthaltene OCSP Service URLs"
+
+#: src/dirmngr.c:140
msgid "|URL|redirect all HTTP requests to URL"
msgstr "|URL|Leite alle HTTP Anfragen über URL"
-#: src/dirmngr.c:139
+#: src/dirmngr.c:142
msgid "|HOST|use HOST for LDAP queries"
msgstr "|HOST|Benutze HOST für LDAP Anfragen"
-#: src/dirmngr.c:141
+#: src/dirmngr.c:144
msgid "do not use fallback hosts with --ldap-proxy"
msgstr "Keine Benuztung der Rückgriffshosts mit --ldap-proxy"
-#: src/dirmngr.c:144
+#: src/dirmngr.c:147
msgid "|FILE|read LDAP server list from FILE"
msgstr "|DATEI|Lese die LDAP Serverliste aus DATEI"
-#: src/dirmngr.c:146
+#: src/dirmngr.c:149
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr "Füge neue Server aus den CRL Distribution Points der Serverliste hinzu"
-#: src/dirmngr.c:148 src/dirmngr_ldap.c:75
+#: src/dirmngr.c:151 src/dirmngr_ldap.c:75
msgid "|N|set LDAP timeout to N seconds"
msgstr "|N|Setze das LDAP Timeout auf N Sekunden"
-#: src/dirmngr.c:150
+#: src/dirmngr.c:153
msgid "|URL|use OCSP responder at URL"
msgstr "|URL|Benutze den OCSP Reponder mit dieser URL"
-#: src/dirmngr.c:151
+#: src/dirmngr.c:154
msgid "|FPR|OCSP response signed by FPR"
msgstr "|FPR|OCSP Antwort ist durch FPR signiert"
-#: src/dirmngr.c:154
+#: src/dirmngr.c:157
msgid "|N|do not return more than N items in one query"
msgstr "|N|Nicht mehr als N Angaben in einer Anfrage zurückgeben"
-#: src/dirmngr.c:156
+#: src/dirmngr.c:159
msgid "|FILE|listen on socket FILE"
msgstr "|DATEI|Anfragen auf Socket DATEI annehmen"
-#: src/dirmngr.c:211 src/dirmngr-client.c:126 src/dirmngr_ldap.c:134
+#: src/dirmngr.c:214 src/dirmngr-client.c:126 src/dirmngr_ldap.c:134
msgid "Please report bugs to <gpa-dev at gnupg.org>.\n"
msgstr "Berichte über Bugs (Programmfehler) bitte an <gpa-dev at gnupg.org>.\n"
-#: src/dirmngr.c:215
+#: src/dirmngr.c:218
msgid "Usage: dirmngr [options] (-h for help)"
msgstr "Gebrauch: dirmnr [Optionen] [Kommando [Argumente]]"
-#: src/dirmngr.c:218
+#: src/dirmngr.c:221
msgid ""
"Syntax: dirmngr [options] [command [args]]\n"
"LDAP and OCSP access for GnuPG\n"
@@ -789,179 +793,179 @@
"Syntax: dirmngr [Optionen] [Kommando [Argumente]]\n"
"LDAP und OCSP Zugriff für GnuPG\n"
-#: src/dirmngr.c:289
+#: src/dirmngr.c:292
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr "Ungültige Debugebene '%s' angegeben\n"
-#: src/dirmngr.c:290
+#: src/dirmngr.c:293
#, c-format
msgid "valid debug levels are: %s\n"
msgstr "Gültige Debugebenen sind: %s\n"
-#: src/dirmngr.c:328
+#: src/dirmngr.c:331
msgid "usage: dirmngr [options] "
msgstr "Gebrauch: dirmngr [Optionen] "
-#: src/dirmngr.c:353
+#: src/dirmngr.c:356
#, c-format
msgid "error spawning ldap wrapper ripper thread: %s\n"
msgstr "Fehler beim Starten des LDAP Wrapper Thread: %s\n"
-#: src/dirmngr.c:471 src/dirmngr.c:481
+#: src/dirmngr.c:476 src/dirmngr.c:486
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr "%s ist zu alt (benötige %s, habe %s)\n"
-#: src/dirmngr.c:582
+#: src/dirmngr.c:587
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr "Hinweis: Voreingestellte Optionendatei `%s' nicht vorhanden\n"
-#: src/dirmngr.c:587 src/dirmngr.c:1248
+#: src/dirmngr.c:592 src/dirmngr.c:1253
#, c-format
msgid "option file `%s': %s\n"
msgstr "Optionendatei `%s': %s\n"
-#: src/dirmngr.c:595
+#: src/dirmngr.c:600
#, c-format
msgid "reading options from `%s'\n"
msgstr "Optionen werden von `%s' gelesen\n"
-#: src/dirmngr.c:701
+#: src/dirmngr.c:706
#, c-format
msgid "WARNING: running with faked system time %s\n"
msgstr "WARNUNG: Prozess läuft mit getürkter Systemzeit %s\n"
-#: src/dirmngr.c:777
+#: src/dirmngr.c:782
msgid "colons are not allowed in the socket name\n"
msgstr "Doppelpunkte sind im Namen des Sockets nicht erlaubt\n"
-#: src/dirmngr.c:782
+#: src/dirmngr.c:787
msgid "name of socket too long\n"
msgstr "Name des Sockets ist zu lang\n"
-#: src/dirmngr.c:789
+#: src/dirmngr.c:794
#, c-format
msgid "can't create socket: %s\n"
msgstr "Fehler beim Erzeugen des Sockets: %s\n"
-#: src/dirmngr.c:808
+#: src/dirmngr.c:813
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr "Fehler beim Binden des Sockets an `%s': %s\n"
-#: src/dirmngr.c:817
+#: src/dirmngr.c:822
#, c-format
msgid "listen() failed: %s\n"
msgstr "listen() fehlgeschlagen: %s\n"
-#: src/dirmngr.c:823
+#: src/dirmngr.c:828
#, c-format
msgid "listening on socket `%s'\n"
msgstr "Anfragen werden auf Socket `%s' engegengenommen\n"
-#: src/dirmngr.c:829
+#: src/dirmngr.c:834
#, c-format
msgid "fork failed: %s\n"
msgstr "fork() fehlgeschlagen: %s\n"
-#: src/dirmngr.c:847
+#: src/dirmngr.c:852
msgid "out of core\n"
msgstr "Nicht genügend Hauptspeicher vorhanden\n"
-#: src/dirmngr.c:886
+#: src/dirmngr.c:891
#, c-format
msgid "setsid() failed: %s\n"
msgstr "setsid() fehlgeschlagen: %s\n"
-#: src/dirmngr.c:896
+#: src/dirmngr.c:901
#, c-format
msgid "chdir to / failed: %s\n"
msgstr "chdir nach / fehlgeschlagen: %s\n"
-#: src/dirmngr.c:945
+#: src/dirmngr.c:950
#, c-format
msgid "fetching CRL from `%s' failed: %s\n"
msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n"
-#: src/dirmngr.c:951
+#: src/dirmngr.c:956
#, c-format
msgid "processing CRL from `%s' failed: %s\n"
msgstr "Verarbeitung der CRL von `%s' fehlgeschlagen: %s\n"
-#: src/dirmngr.c:1095
+#: src/dirmngr.c:1100
#, c-format
msgid "error opening `%s': %s\n"
msgstr "Fehler beim Öffnen von `%s': %s\n"
-#: src/dirmngr.c:1112
+#: src/dirmngr.c:1117
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr "%s:%u: Zeile ist zu lang - übergangen\n"
-#: src/dirmngr.c:1140
+#: src/dirmngr.c:1145
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr "%s:%u: Kein Hostname angegeben\n"
-#: src/dirmngr.c:1159
+#: src/dirmngr.c:1164
#, c-format
msgid "%s:%u: password given without user\n"
msgstr "%s:%u: Passwort angegeben ohne Username\n"
-#: src/dirmngr.c:1180
+#: src/dirmngr.c:1185
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr "%s:%u: Diese Zeile wird übersprungen\n"
-#: src/dirmngr.c:1280
+#: src/dirmngr.c:1285
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
"SIGHUP empfangen - lese die Konfiguration erneut und lösche die Caches\n"
-#: src/dirmngr.c:1294
+#: src/dirmngr.c:1299
msgid "SIGUSR2 received - no action defined\n"
msgstr "SIGUSR2 empfangen - keine Aktion definiert\n"
-#: src/dirmngr.c:1299
+#: src/dirmngr.c:1304
msgid "SIGTERM received - shutting down ...\n"
msgstr "SIGTERM empfangen - wird heruntergefahren ...\n"
-#: src/dirmngr.c:1301
+#: src/dirmngr.c:1306
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr "SIGTERM empfangen - immer noch %d Verbindungen aktiv\n"
-#: src/dirmngr.c:1306
+#: src/dirmngr.c:1311
msgid "shutdown forced\n"
msgstr "Herunterfahren wurde erzwungen\n"
-#: src/dirmngr.c:1314
+#: src/dirmngr.c:1319
msgid "SIGINT received - immediate shutdown\n"
msgstr "SIGINT empfangen - wird sofort heruntergefahren\n"
-#: src/dirmngr.c:1321
+#: src/dirmngr.c:1326
#, c-format
msgid "signal %d received - no action defined\n"
msgstr "Signal %d empfangen - keine Aktion definiert\n"
-#: src/dirmngr.c:1335
+#: src/dirmngr.c:1340
#, c-format
msgid "handler for fd %d started\n"
msgstr "Routine für fd %d gestartet\n"
-#: src/dirmngr.c:1340
+#: src/dirmngr.c:1345
#, c-format
msgid "handler for fd %d terminated\n"
msgstr "Routine für fd %d beendet\n"
-#: src/dirmngr.c:1396
+#: src/dirmngr.c:1401
#, c-format
msgid "accept failed: %s - waiting 1s\n"
msgstr "accept() fehlgeschlagen: %s - warte 1s\n"
-#: src/dirmngr.c:1403
+#: src/dirmngr.c:1408
#, c-format
msgid "error spawning connection handler: %s\n"
msgstr "Fehler beim Starten des Verbindungshandler: %s\n"
Index: dirmngr/po/dirmngr.pot
diff -u dirmngr/po/dirmngr.pot:1.6 dirmngr/po/dirmngr.pot:1.7
--- dirmngr/po/dirmngr.pot:1.6 Wed Nov 24 13:25:53 2004
+++ dirmngr/po/dirmngr.pot Wed Nov 24 15:44:01 2004
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: gpa-dev at gnupg.org\n"
-"POT-Creation-Date: 2004-11-24 13:16+0100\n"
+"POT-Creation-Date: 2004-11-24 15:35+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"
@@ -206,7 +206,7 @@
msgid "unsupported record type in `%s' line %u skipped\n"
msgstr ""
-#: src/crlcache.c:574 src/crlcache.c:803 src/dirmngr.c:1191
+#: src/crlcache.c:574 src/crlcache.c:803 src/dirmngr.c:1196
#, c-format
msgid "error reading `%s': %s\n"
msgstr ""
@@ -608,333 +608,337 @@
msgid "Certificate search not possible due to disabled %s\n"
msgstr ""
-#: src/dirmngr.c:105
+#: src/dirmngr.c:106
msgid ""
"@Commands:\n"
" "
msgstr ""
-#: src/dirmngr.c:107
+#: src/dirmngr.c:108
msgid "run in server mode (foreground)"
msgstr ""
-#: src/dirmngr.c:108
+#: src/dirmngr.c:109
msgid "run in daemon mode (background)"
msgstr ""
-#: src/dirmngr.c:109
+#: src/dirmngr.c:110
msgid "list the contents of the CRL cache"
msgstr ""
-#: src/dirmngr.c:110
+#: src/dirmngr.c:111
msgid "|FILE|load CRL from FILE into cache"
msgstr ""
-#: src/dirmngr.c:111
+#: src/dirmngr.c:112
msgid "|URL|fetch a CRL from URL"
msgstr ""
-#: src/dirmngr.c:112
+#: src/dirmngr.c:113
msgid "shutdown the dirmngr"
msgstr ""
-#: src/dirmngr.c:113
+#: src/dirmngr.c:114
msgid "flush the cache"
msgstr ""
-#: src/dirmngr.c:116
+#: src/dirmngr.c:117
msgid ""
"@\n"
"Options:\n"
" "
msgstr ""
-#: src/dirmngr.c:118 src/dirmngr-client.c:64 src/dirmngr_ldap.c:73
+#: src/dirmngr.c:119 src/dirmngr-client.c:64 src/dirmngr_ldap.c:73
msgid "verbose"
msgstr ""
-#: src/dirmngr.c:119 src/dirmngr-client.c:65 src/dirmngr_ldap.c:74
+#: src/dirmngr.c:120 src/dirmngr-client.c:65 src/dirmngr_ldap.c:74
msgid "be somewhat more quiet"
msgstr ""
-#: src/dirmngr.c:120
+#: src/dirmngr.c:121
msgid "sh-style command output"
msgstr ""
-#: src/dirmngr.c:121
+#: src/dirmngr.c:122
msgid "csh-style command output"
msgstr ""
-#: src/dirmngr.c:122
+#: src/dirmngr.c:123
msgid "|FILE|read options from FILE"
msgstr ""
-#: src/dirmngr.c:124
+#: src/dirmngr.c:125
msgid "|LEVEL|set the debugging level to LEVEL"
msgstr ""
-#: src/dirmngr.c:125
+#: src/dirmngr.c:126
msgid "do not detach from the console"
msgstr ""
-#: src/dirmngr.c:126
+#: src/dirmngr.c:127
msgid "|FILE|write logs to FILE"
msgstr ""
-#: src/dirmngr.c:127
+#: src/dirmngr.c:128
msgid "run without asking a user"
msgstr ""
-#: src/dirmngr.c:128
+#: src/dirmngr.c:129
msgid "force loading of outdated CRLs"
msgstr ""
-#: src/dirmngr.c:129
+#: src/dirmngr.c:130
msgid "allow sending OCSP requests"
msgstr ""
-#: src/dirmngr.c:130
+#: src/dirmngr.c:131
msgid "inhibit the use of HTTP"
msgstr ""
-#: src/dirmngr.c:131
+#: src/dirmngr.c:132
msgid "inhibit the use of LDAP"
msgstr ""
-#: src/dirmngr.c:133
+#: src/dirmngr.c:134
msgid "ignore HTTP CRL distribution points"
msgstr ""
-#: src/dirmngr.c:135
+#: src/dirmngr.c:136
msgid "ignore LDAP CRL distribution points"
msgstr ""
-#: src/dirmngr.c:137
+#: src/dirmngr.c:138
+msgid "ignore certificate contained OCSP service URLs"
+msgstr ""
+
+#: src/dirmngr.c:140
msgid "|URL|redirect all HTTP requests to URL"
msgstr ""
-#: src/dirmngr.c:139
+#: src/dirmngr.c:142
msgid "|HOST|use HOST for LDAP queries"
msgstr ""
-#: src/dirmngr.c:141
+#: src/dirmngr.c:144
msgid "do not use fallback hosts with --ldap-proxy"
msgstr ""
-#: src/dirmngr.c:144
+#: src/dirmngr.c:147
msgid "|FILE|read LDAP server list from FILE"
msgstr ""
-#: src/dirmngr.c:146
+#: src/dirmngr.c:149
msgid "add new servers discovered in CRL distribution points to serverlist"
msgstr ""
-#: src/dirmngr.c:148 src/dirmngr_ldap.c:75
+#: src/dirmngr.c:151 src/dirmngr_ldap.c:75
msgid "|N|set LDAP timeout to N seconds"
msgstr ""
-#: src/dirmngr.c:150
+#: src/dirmngr.c:153
msgid "|URL|use OCSP responder at URL"
msgstr ""
-#: src/dirmngr.c:151
+#: src/dirmngr.c:154
msgid "|FPR|OCSP response signed by FPR"
msgstr ""
-#: src/dirmngr.c:154
+#: src/dirmngr.c:157
msgid "|N|do not return more than N items in one query"
msgstr ""
-#: src/dirmngr.c:156
+#: src/dirmngr.c:159
msgid "|FILE|listen on socket FILE"
msgstr ""
-#: src/dirmngr.c:211 src/dirmngr-client.c:126 src/dirmngr_ldap.c:134
+#: src/dirmngr.c:214 src/dirmngr-client.c:126 src/dirmngr_ldap.c:134
msgid "Please report bugs to <gpa-dev at gnupg.org>.\n"
msgstr ""
-#: src/dirmngr.c:215
+#: src/dirmngr.c:218
msgid "Usage: dirmngr [options] (-h for help)"
msgstr ""
-#: src/dirmngr.c:218
+#: src/dirmngr.c:221
msgid ""
"Syntax: dirmngr [options] [command [args]]\n"
"LDAP and OCSP access for GnuPG\n"
msgstr ""
-#: src/dirmngr.c:289
+#: src/dirmngr.c:292
#, c-format
msgid "invalid debug-level `%s' given\n"
msgstr ""
-#: src/dirmngr.c:290
+#: src/dirmngr.c:293
#, c-format
msgid "valid debug levels are: %s\n"
msgstr ""
-#: src/dirmngr.c:328
+#: src/dirmngr.c:331
msgid "usage: dirmngr [options] "
msgstr ""
-#: src/dirmngr.c:353
+#: src/dirmngr.c:356
#, c-format
msgid "error spawning ldap wrapper ripper thread: %s\n"
msgstr ""
-#: src/dirmngr.c:471 src/dirmngr.c:481
+#: src/dirmngr.c:476 src/dirmngr.c:486
#, c-format
msgid "%s is too old (need %s, have %s)\n"
msgstr ""
-#: src/dirmngr.c:582
+#: src/dirmngr.c:587
#, c-format
msgid "NOTE: no default option file `%s'\n"
msgstr ""
-#: src/dirmngr.c:587 src/dirmngr.c:1248
+#: src/dirmngr.c:592 src/dirmngr.c:1253
#, c-format
msgid "option file `%s': %s\n"
msgstr ""
-#: src/dirmngr.c:595
+#: src/dirmngr.c:600
#, c-format
msgid "reading options from `%s'\n"
msgstr ""
-#: src/dirmngr.c:701
+#: src/dirmngr.c:706
#, c-format
msgid "WARNING: running with faked system time %s\n"
msgstr ""
-#: src/dirmngr.c:777
+#: src/dirmngr.c:782
msgid "colons are not allowed in the socket name\n"
msgstr ""
-#: src/dirmngr.c:782
+#: src/dirmngr.c:787
msgid "name of socket too long\n"
msgstr ""
-#: src/dirmngr.c:789
+#: src/dirmngr.c:794
#, c-format
msgid "can't create socket: %s\n"
msgstr ""
-#: src/dirmngr.c:808
+#: src/dirmngr.c:813
#, c-format
msgid "error binding socket to `%s': %s\n"
msgstr ""
-#: src/dirmngr.c:817
+#: src/dirmngr.c:822
#, c-format
msgid "listen() failed: %s\n"
msgstr ""
-#: src/dirmngr.c:823
+#: src/dirmngr.c:828
#, c-format
msgid "listening on socket `%s'\n"
msgstr ""
-#: src/dirmngr.c:829
+#: src/dirmngr.c:834
#, c-format
msgid "fork failed: %s\n"
msgstr ""
-#: src/dirmngr.c:847
+#: src/dirmngr.c:852
msgid "out of core\n"
msgstr ""
-#: src/dirmngr.c:886
+#: src/dirmngr.c:891
#, c-format
msgid "setsid() failed: %s\n"
msgstr ""
-#: src/dirmngr.c:896
+#: src/dirmngr.c:901
#, c-format
msgid "chdir to / failed: %s\n"
msgstr ""
-#: src/dirmngr.c:945
+#: src/dirmngr.c:950
#, c-format
msgid "fetching CRL from `%s' failed: %s\n"
msgstr ""
-#: src/dirmngr.c:951
+#: src/dirmngr.c:956
#, c-format
msgid "processing CRL from `%s' failed: %s\n"
msgstr ""
-#: src/dirmngr.c:1095
+#: src/dirmngr.c:1100
#, c-format
msgid "error opening `%s': %s\n"
msgstr ""
-#: src/dirmngr.c:1112
+#: src/dirmngr.c:1117
#, c-format
msgid "%s:%u: line too long - skipped\n"
msgstr ""
-#: src/dirmngr.c:1140
+#: src/dirmngr.c:1145
#, c-format
msgid "%s:%u: no hostname given\n"
msgstr ""
-#: src/dirmngr.c:1159
+#: src/dirmngr.c:1164
#, c-format
msgid "%s:%u: password given without user\n"
msgstr ""
-#: src/dirmngr.c:1180
+#: src/dirmngr.c:1185
#, c-format
msgid "%s:%u: skipping this line\n"
msgstr ""
-#: src/dirmngr.c:1280
+#: src/dirmngr.c:1285
msgid "SIGHUP received - re-reading configuration and flushing caches\n"
msgstr ""
-#: src/dirmngr.c:1294
+#: src/dirmngr.c:1299
msgid "SIGUSR2 received - no action defined\n"
msgstr ""
-#: src/dirmngr.c:1299
+#: src/dirmngr.c:1304
msgid "SIGTERM received - shutting down ...\n"
msgstr ""
-#: src/dirmngr.c:1301
+#: src/dirmngr.c:1306
#, c-format
msgid "SIGTERM received - still %d active connections\n"
msgstr ""
-#: src/dirmngr.c:1306
+#: src/dirmngr.c:1311
msgid "shutdown forced\n"
msgstr ""
-#: src/dirmngr.c:1314
+#: src/dirmngr.c:1319
msgid "SIGINT received - immediate shutdown\n"
msgstr ""
-#: src/dirmngr.c:1321
+#: src/dirmngr.c:1326
#, c-format
msgid "signal %d received - no action defined\n"
msgstr ""
-#: src/dirmngr.c:1335
+#: src/dirmngr.c:1340
#, c-format
msgid "handler for fd %d started\n"
msgstr ""
-#: src/dirmngr.c:1340
+#: src/dirmngr.c:1345
#, c-format
msgid "handler for fd %d terminated\n"
msgstr ""
-#: src/dirmngr.c:1396
+#: src/dirmngr.c:1401
#, c-format
msgid "accept failed: %s - waiting 1s\n"
msgstr ""
-#: src/dirmngr.c:1403
+#: src/dirmngr.c:1408
#, c-format
msgid "error spawning connection handler: %s\n"
msgstr ""
Index: dirmngr/src/ChangeLog
diff -u dirmngr/src/ChangeLog:1.27 dirmngr/src/ChangeLog:1.28
--- dirmngr/src/ChangeLog:1.27 Wed Nov 24 13:25:53 2004
+++ dirmngr/src/ChangeLog Wed Nov 24 15:44:01 2004
@@ -1,7 +1,9 @@
2004-11-24 Werner Koch <wk at g10code.com>
- * dirmngr.c: New options --ignore-http-dp and --ignore-ldap-dp.
+ * dirmngr.c: New options --ignore-http-dp, --ignore-ldap-dp and
+ --ignore-ocsp-service-url.
* crlcache.c (crl_cache_reload_crl): Implement them.
+ * ocsp.c (ocsp_isvalid): Ditto.
2004-11-23 Werner Koch <wk at g10code.com>
Index: dirmngr/src/dirmngr.c
diff -u dirmngr/src/dirmngr.c:1.46 dirmngr/src/dirmngr.c:1.47
--- dirmngr/src/dirmngr.c:1.46 Wed Nov 24 13:25:53 2004
+++ dirmngr/src/dirmngr.c Wed Nov 24 15:44:01 2004
@@ -80,6 +80,7 @@
oDisableLDAP,
oIgnoreLDAPDP,
oIgnoreHTTPDP,
+ oIgnoreOCSPSvcUrl,
oHonorHTTPProxy,
oHTTPProxy,
oLDAPProxy,
@@ -129,10 +130,12 @@
{ oAllowOCSP, "allow-ocsp",0,N_("allow sending OCSP requests")},
{ oDisableHTTP, "disable-http", 0, N_("inhibit the use of HTTP")},
{ oDisableLDAP, "disable-ldap", 0, N_("inhibit the use of LDAP")},
- { oIgnoreHTTPDP,"ignore-http-dp",0,
+ { oIgnoreHTTPDP,"ignore-http-dp", 0,
N_("ignore HTTP CRL distribution points")},
- { oIgnoreLDAPDP,"ignore-ldap-dp",0,
+ { oIgnoreLDAPDP,"ignore-ldap-dp", 0,
N_("ignore LDAP CRL distribution points")},
+ { oIgnoreOCSPSvcUrl, "ignore-ocsp-service-url", 0,
+ N_("ignore certificate contained OCSP service URLs")},
{ oHTTPProxy, "http-proxy", 2,
N_("|URL|redirect all HTTP requests to URL")},
{ oLDAPProxy, "ldap-proxy", 2,
@@ -380,6 +383,7 @@
opt.only_ldap_proxy = 0;
opt.ignore_http_dp = 0;
opt.ignore_ldap_dp = 0;
+ opt.ignore_ocsp_service_url = 0;
return 1;
}
@@ -418,6 +422,7 @@
case oOnlyLDAPProxy: opt.only_ldap_proxy = 1; break;
case oIgnoreHTTPDP: opt.ignore_http_dp = 1; break;
case oIgnoreLDAPDP: opt.ignore_ldap_dp = 1; break;
+ case oIgnoreOCSPSvcUrl: opt.ignore_ocsp_service_url = 1; break;
default:
return 0; /* Not handled. */
Index: dirmngr/src/dirmngr.h
diff -u dirmngr/src/dirmngr.h:1.22 dirmngr/src/dirmngr.h:1.23
--- dirmngr/src/dirmngr.h:1.22 Wed Nov 24 13:25:53 2004
+++ dirmngr/src/dirmngr.h Wed Nov 24 15:44:01 2004
@@ -89,6 +89,8 @@
int only_ldap_proxy; /* Only use the LDAP proxy; no fallback. */
int ignore_http_dp; /* Ignore HTTP CRL distribution points. */
int ignore_ldap_dp; /* Ignore LDAP CRL distribution points. */
+ int ignore_ocsp_service_url; /* Ignore OCSP service URLs as given in
+ the certificate. */
int allow_ocsp; /* Allow using OCSP. */
Index: dirmngr/src/ocsp.c
diff -u dirmngr/src/ocsp.c:1.11 dirmngr/src/ocsp.c:1.12
--- dirmngr/src/ocsp.c:1.11 Tue Nov 23 14:20:44 2004
+++ dirmngr/src/ocsp.c Wed Nov 24 15:44:01 2004
@@ -458,7 +458,7 @@
2. If this fails use the default responder, if any.
*/
url = NULL;
- for (idx=0; !url
+ for (idx=0; !url && !opt.ignore_ocsp_service_url
&& !(err=ksba_cert_get_authority_info_access (cert, idx,
&oid, &name)); idx++)
{
More information about the Gnupg-commits
mailing list