2014-10-17 13:31:07 +02:00
|
|
|
|
/* dirmngr.c - Keyserver and X.509 LDAP access
|
2014-03-18 11:07:05 +01:00
|
|
|
|
* Copyright (C) 2002 Klarälvdalens Datakonsult AB
|
|
|
|
|
* Copyright (C) 2003, 2004, 2006, 2007, 2008, 2010, 2011 g10 Code GmbH
|
|
|
|
|
* Copyright (C) 2014 Werner Koch
|
2010-06-09 16:53:51 +00:00
|
|
|
|
*
|
2014-03-18 11:07:05 +01:00
|
|
|
|
* This file is part of GnuPG.
|
2010-06-09 16:53:51 +00:00
|
|
|
|
*
|
2014-03-18 11:07:05 +01:00
|
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
2010-06-09 16:53:51 +00:00
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
2014-03-18 11:07:05 +01:00
|
|
|
|
* the Free Software Foundation; either version 3 of the License, or
|
2010-06-09 16:53:51 +00:00
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
2014-03-18 11:07:05 +01:00
|
|
|
|
* GnuPG is distributed in the hope that it will be useful,
|
2010-06-09 16:53:51 +00:00
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2014-03-18 11:07:05 +01:00
|
|
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
2010-06-09 16:53:51 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <stddef.h>
|
|
|
|
|
#include <stdarg.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
#include <time.h>
|
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
|
|
|
|
#include <sys/socket.h>
|
|
|
|
|
#include <sys/un.h>
|
|
|
|
|
#endif
|
|
|
|
|
#include <sys/stat.h>
|
|
|
|
|
#include <unistd.h>
|
2010-07-16 13:19:45 +00:00
|
|
|
|
#ifdef HAVE_SIGNAL_H
|
|
|
|
|
# include <signal.h>
|
|
|
|
|
#endif
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#include <npth.h>
|
2014-10-02 17:33:57 +02:00
|
|
|
|
|
|
|
|
|
#include "dirmngr-err.h"
|
|
|
|
|
|
|
|
|
|
#if HTTP_USE_NTBTLS
|
|
|
|
|
# include <ntbtls.h>
|
|
|
|
|
#elif HTTP_USE_GNUTLS
|
2014-05-05 16:09:45 +02:00
|
|
|
|
# include <gnutls/gnutls.h>
|
|
|
|
|
#endif /*HTTP_USE_GNUTLS*/
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#define JNLIB_NEED_LOG_LOGV
|
2010-08-06 13:52:01 +00:00
|
|
|
|
#define JNLIB_NEED_AFLOCAL
|
2010-06-09 16:53:51 +00:00
|
|
|
|
#include "dirmngr.h"
|
|
|
|
|
|
2011-01-25 11:26:01 +01:00
|
|
|
|
#include <assuan.h>
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
#include "certcache.h"
|
|
|
|
|
#include "crlcache.h"
|
|
|
|
|
#include "crlfetch.h"
|
|
|
|
|
#include "misc.h"
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#if USE_LDAP
|
|
|
|
|
# include "ldapserver.h"
|
|
|
|
|
#endif
|
2010-06-09 16:53:51 +00:00
|
|
|
|
#include "asshelp.h"
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#if USE_LDAP
|
|
|
|
|
# include "ldap-wrapper.h"
|
|
|
|
|
#endif
|
2012-02-06 20:50:47 +01:00
|
|
|
|
#include "../common/init.h"
|
2014-03-12 18:24:52 +01:00
|
|
|
|
#include "gc-opt-flags.h"
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
2010-07-16 13:19:45 +00:00
|
|
|
|
/* The plain Windows version uses the windows service system. For
|
|
|
|
|
example to start the service you may use "sc start dirmngr".
|
|
|
|
|
WindowsCE does not support this; the service system over there is
|
|
|
|
|
based on a single process with all services being DLLs - we can't
|
|
|
|
|
support this easily. */
|
|
|
|
|
#if defined(HAVE_W32_SYSTEM) && !defined(HAVE_W32CE_SYSTEM)
|
|
|
|
|
# define USE_W32_SERVICE 1
|
|
|
|
|
#endif
|
|
|
|
|
|
2014-12-01 09:50:55 +01:00
|
|
|
|
#ifndef ENAMETOOLONG
|
|
|
|
|
# define ENAMETOOLONG EINVAL
|
|
|
|
|
#endif
|
|
|
|
|
|
2010-07-16 13:19:45 +00:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
enum cmd_and_opt_values {
|
|
|
|
|
aNull = 0,
|
|
|
|
|
oCsh = 'c',
|
|
|
|
|
oQuiet = 'q',
|
|
|
|
|
oSh = 's',
|
|
|
|
|
oVerbose = 'v',
|
|
|
|
|
oNoVerbose = 500,
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
aServer,
|
|
|
|
|
aDaemon,
|
|
|
|
|
aService,
|
|
|
|
|
aListCRLs,
|
|
|
|
|
aLoadCRL,
|
|
|
|
|
aFetchCRL,
|
|
|
|
|
aShutdown,
|
|
|
|
|
aFlush,
|
|
|
|
|
aGPGConfList,
|
|
|
|
|
aGPGConfTest,
|
|
|
|
|
|
|
|
|
|
oOptions,
|
|
|
|
|
oDebug,
|
|
|
|
|
oDebugAll,
|
|
|
|
|
oDebugWait,
|
|
|
|
|
oDebugLevel,
|
2014-05-05 16:09:45 +02:00
|
|
|
|
oGnutlsDebug,
|
2010-06-09 16:53:51 +00:00
|
|
|
|
oNoGreeting,
|
|
|
|
|
oNoOptions,
|
|
|
|
|
oHomedir,
|
|
|
|
|
oNoDetach,
|
|
|
|
|
oLogFile,
|
|
|
|
|
oBatch,
|
|
|
|
|
oDisableHTTP,
|
|
|
|
|
oDisableLDAP,
|
|
|
|
|
oIgnoreLDAPDP,
|
|
|
|
|
oIgnoreHTTPDP,
|
|
|
|
|
oIgnoreOCSPSvcUrl,
|
|
|
|
|
oHonorHTTPProxy,
|
|
|
|
|
oHTTPProxy,
|
|
|
|
|
oLDAPProxy,
|
|
|
|
|
oOnlyLDAPProxy,
|
|
|
|
|
oLDAPFile,
|
|
|
|
|
oLDAPTimeout,
|
|
|
|
|
oLDAPAddServers,
|
|
|
|
|
oOCSPResponder,
|
|
|
|
|
oOCSPSigner,
|
|
|
|
|
oOCSPMaxClockSkew,
|
|
|
|
|
oOCSPMaxPeriod,
|
|
|
|
|
oOCSPCurrentPeriod,
|
|
|
|
|
oMaxReplies,
|
2014-05-05 16:09:45 +02:00
|
|
|
|
oHkpCaCert,
|
2010-06-09 16:53:51 +00:00
|
|
|
|
oFakedSystemTime,
|
|
|
|
|
oForce,
|
|
|
|
|
oAllowOCSP,
|
|
|
|
|
oSocketName,
|
|
|
|
|
oLDAPWrapperProgram,
|
|
|
|
|
oHTTPWrapperProgram,
|
|
|
|
|
oIgnoreCertExtension,
|
|
|
|
|
aTest
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static ARGPARSE_OPTS opts[] = {
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
ARGPARSE_group (300, N_("@Commands:\n ")),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_c (aServer, "server", N_("run in server mode (foreground)") ),
|
|
|
|
|
ARGPARSE_c (aDaemon, "daemon", N_("run in daemon mode (background)") ),
|
2010-07-16 13:19:45 +00:00
|
|
|
|
#ifdef USE_W32_SERVICE
|
2010-06-09 16:53:51 +00:00
|
|
|
|
ARGPARSE_c (aService, "service", N_("run as windows service (background)")),
|
|
|
|
|
#endif
|
|
|
|
|
ARGPARSE_c (aListCRLs, "list-crls", N_("list the contents of the CRL cache")),
|
|
|
|
|
ARGPARSE_c (aLoadCRL, "load-crl", N_("|FILE|load CRL from FILE into cache")),
|
|
|
|
|
ARGPARSE_c (aFetchCRL, "fetch-crl", N_("|URL|fetch a CRL from URL")),
|
|
|
|
|
ARGPARSE_c (aShutdown, "shutdown", N_("shutdown the dirmngr")),
|
|
|
|
|
ARGPARSE_c (aFlush, "flush", N_("flush the cache")),
|
|
|
|
|
ARGPARSE_c (aGPGConfList, "gpgconf-list", "@"),
|
|
|
|
|
ARGPARSE_c (aGPGConfTest, "gpgconf-test", "@"),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_group (301, N_("@\nOptions:\n ")),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")),
|
|
|
|
|
ARGPARSE_s_n (oQuiet, "quiet", N_("be somewhat more quiet")),
|
|
|
|
|
ARGPARSE_s_n (oSh, "sh", N_("sh-style command output")),
|
|
|
|
|
ARGPARSE_s_n (oCsh, "csh", N_("csh-style command output")),
|
|
|
|
|
ARGPARSE_s_s (oOptions, "options", N_("|FILE|read options from FILE")),
|
|
|
|
|
ARGPARSE_s_s (oDebugLevel, "debug-level",
|
|
|
|
|
N_("|LEVEL|set the debugging level to LEVEL")),
|
|
|
|
|
ARGPARSE_s_n (oNoDetach, "no-detach", N_("do not detach from the console")),
|
|
|
|
|
ARGPARSE_s_s (oLogFile, "log-file",
|
|
|
|
|
N_("|FILE|write server mode logs to FILE")),
|
|
|
|
|
ARGPARSE_s_n (oBatch, "batch", N_("run without asking a user")),
|
|
|
|
|
ARGPARSE_s_n (oForce, "force", N_("force loading of outdated CRLs")),
|
|
|
|
|
ARGPARSE_s_n (oAllowOCSP, "allow-ocsp", N_("allow sending OCSP requests")),
|
|
|
|
|
ARGPARSE_s_n (oDisableHTTP, "disable-http", N_("inhibit the use of HTTP")),
|
|
|
|
|
ARGPARSE_s_n (oDisableLDAP, "disable-ldap", N_("inhibit the use of LDAP")),
|
|
|
|
|
ARGPARSE_s_n (oIgnoreHTTPDP,"ignore-http-dp",
|
|
|
|
|
N_("ignore HTTP CRL distribution points")),
|
|
|
|
|
ARGPARSE_s_n (oIgnoreLDAPDP,"ignore-ldap-dp",
|
|
|
|
|
N_("ignore LDAP CRL distribution points")),
|
|
|
|
|
ARGPARSE_s_n (oIgnoreOCSPSvcUrl, "ignore-ocsp-service-url",
|
|
|
|
|
N_("ignore certificate contained OCSP service URLs")),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_s_s (oHTTPProxy, "http-proxy",
|
|
|
|
|
N_("|URL|redirect all HTTP requests to URL")),
|
|
|
|
|
ARGPARSE_s_s (oLDAPProxy, "ldap-proxy",
|
|
|
|
|
N_("|HOST|use HOST for LDAP queries")),
|
|
|
|
|
ARGPARSE_s_n (oOnlyLDAPProxy, "only-ldap-proxy",
|
|
|
|
|
N_("do not use fallback hosts with --ldap-proxy")),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_s_s (oLDAPFile, "ldapserverlist-file",
|
|
|
|
|
N_("|FILE|read LDAP server list from FILE")),
|
|
|
|
|
ARGPARSE_s_n (oLDAPAddServers, "add-servers",
|
|
|
|
|
N_("add new servers discovered in CRL distribution"
|
|
|
|
|
" points to serverlist")),
|
|
|
|
|
ARGPARSE_s_i (oLDAPTimeout, "ldaptimeout",
|
|
|
|
|
N_("|N|set LDAP timeout to N seconds")),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_s_s (oOCSPResponder, "ocsp-responder",
|
|
|
|
|
N_("|URL|use OCSP responder at URL")),
|
2011-01-25 11:26:01 +01:00
|
|
|
|
ARGPARSE_s_s (oOCSPSigner, "ocsp-signer",
|
|
|
|
|
N_("|FPR|OCSP response signed by FPR")),
|
2010-06-09 16:53:51 +00:00
|
|
|
|
ARGPARSE_s_i (oOCSPMaxClockSkew, "ocsp-max-clock-skew", "@"),
|
|
|
|
|
ARGPARSE_s_i (oOCSPMaxPeriod, "ocsp-max-period", "@"),
|
|
|
|
|
ARGPARSE_s_i (oOCSPCurrentPeriod, "ocsp-current-period", "@"),
|
|
|
|
|
|
2011-01-25 11:26:01 +01:00
|
|
|
|
ARGPARSE_s_i (oMaxReplies, "max-replies",
|
2010-06-09 16:53:51 +00:00
|
|
|
|
N_("|N|do not return more than N items in one query")),
|
|
|
|
|
|
2014-05-05 16:09:45 +02:00
|
|
|
|
ARGPARSE_s_s (oHkpCaCert, "hkp-cacert",
|
2014-06-22 17:33:04 +03:00
|
|
|
|
N_("|FILE|use the CA certificates in FILE for HKP over TLS")),
|
2014-05-05 16:09:45 +02:00
|
|
|
|
|
|
|
|
|
|
2010-08-16 11:03:43 +00:00
|
|
|
|
ARGPARSE_s_s (oSocketName, "socket-name", "@"), /* Only for debugging. */
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
ARGPARSE_s_u (oFakedSystemTime, "faked-system-time", "@"), /*(epoch time)*/
|
|
|
|
|
ARGPARSE_p_u (oDebug, "debug", "@"),
|
|
|
|
|
ARGPARSE_s_n (oDebugAll, "debug-all", "@"),
|
2014-05-05 16:09:45 +02:00
|
|
|
|
ARGPARSE_s_i (oGnutlsDebug, "gnutls-debug", "@"),
|
2014-10-02 17:33:57 +02:00
|
|
|
|
ARGPARSE_s_i (oGnutlsDebug, "tls-debug", "@"),
|
2010-06-09 16:53:51 +00:00
|
|
|
|
ARGPARSE_s_i (oDebugWait, "debug-wait", "@"),
|
|
|
|
|
ARGPARSE_s_n (oNoGreeting, "no-greeting", "@"),
|
2011-01-25 11:26:01 +01:00
|
|
|
|
ARGPARSE_s_s (oHomedir, "homedir", "@"),
|
2010-06-09 16:53:51 +00:00
|
|
|
|
ARGPARSE_s_s (oLDAPWrapperProgram, "ldap-wrapper-program", "@"),
|
|
|
|
|
ARGPARSE_s_s (oHTTPWrapperProgram, "http-wrapper-program", "@"),
|
|
|
|
|
ARGPARSE_s_n (oHonorHTTPProxy, "honor-http-proxy", "@"),
|
|
|
|
|
ARGPARSE_s_s (oIgnoreCertExtension,"ignore-cert-extension", "@"),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_group (302,N_("@\n(See the \"info\" manual for a complete listing "
|
|
|
|
|
"of all commands and options)\n")),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_end ()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define DEFAULT_MAX_REPLIES 10
|
|
|
|
|
#define DEFAULT_LDAP_TIMEOUT 100 /* arbitrary large timeout */
|
|
|
|
|
|
2014-12-01 09:50:55 +01:00
|
|
|
|
/* For the cleanup handler we need to keep track of the socket's name. */
|
2010-06-09 16:53:51 +00:00
|
|
|
|
static const char *socket_name;
|
2014-12-01 09:50:55 +01:00
|
|
|
|
/* If the socket has been redirected, this is the name of the
|
|
|
|
|
redirected socket.. */
|
|
|
|
|
static const char *redir_socket_name;
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
/* We need to keep track of the server's nonces (these are dummies for
|
|
|
|
|
POSIX systems). */
|
|
|
|
|
static assuan_sock_nonce_t socket_nonce;
|
|
|
|
|
|
|
|
|
|
/* Only if this flag has been set we will remove the socket file. */
|
|
|
|
|
static int cleanup_socket;
|
|
|
|
|
|
|
|
|
|
/* Keep track of the current log file so that we can avoid updating
|
|
|
|
|
the log file after a SIGHUP if it didn't changed. Malloced. */
|
|
|
|
|
static char *current_logfile;
|
|
|
|
|
|
|
|
|
|
/* Helper to implement --debug-level. */
|
|
|
|
|
static const char *debug_level;
|
|
|
|
|
|
2014-10-02 17:33:57 +02:00
|
|
|
|
/* Helper to set the NTBTLS or GNUTLS log level. */
|
2014-05-05 16:09:45 +02:00
|
|
|
|
static int opt_gnutls_debug = -1;
|
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
/* Flag indicating that a shutdown has been requested. */
|
|
|
|
|
static volatile int shutdown_pending;
|
|
|
|
|
|
|
|
|
|
/* Counter for the active connections. */
|
|
|
|
|
static int active_connections;
|
|
|
|
|
|
|
|
|
|
/* The timer tick used for housekeeping stuff. For Windows we use a
|
|
|
|
|
longer period as the SetWaitableTimer seems to signal earlier than
|
2014-03-18 11:07:05 +01:00
|
|
|
|
the 2 seconds. All values are in seconds. */
|
2010-12-09 11:50:22 +00:00
|
|
|
|
#if defined(HAVE_W32CE_SYSTEM)
|
|
|
|
|
# define TIMERTICK_INTERVAL (60)
|
|
|
|
|
#elif defined(HAVE_W32_SYSTEM)
|
|
|
|
|
# define TIMERTICK_INTERVAL (4)
|
2010-06-09 16:53:51 +00:00
|
|
|
|
#else
|
2010-12-09 11:50:22 +00:00
|
|
|
|
# define TIMERTICK_INTERVAL (2)
|
2010-06-09 16:53:51 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2014-03-18 11:07:05 +01:00
|
|
|
|
#define HOUSEKEEPING_INTERVAL (600)
|
|
|
|
|
|
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
/* This union is used to avoid compiler warnings in case a pointer is
|
|
|
|
|
64 bit and an int 32 bit. We store an integer in a pointer and get
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
it back later (npth_getspecific et al.). */
|
2010-06-09 16:53:51 +00:00
|
|
|
|
union int_and_ptr_u
|
|
|
|
|
{
|
|
|
|
|
int aint;
|
|
|
|
|
assuan_fd_t afd;
|
|
|
|
|
void *aptr;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* The key used to store the current file descriptor in the thread
|
|
|
|
|
local storage. We use this in conjunction with the
|
|
|
|
|
log_set_pid_suffix_cb feature.. */
|
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
|
|
|
|
static int my_tlskey_current_fd;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Prototypes. */
|
|
|
|
|
static void cleanup (void);
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#if USE_LDAP
|
2010-06-09 16:53:51 +00:00
|
|
|
|
static ldap_server_t parse_ldapserver_file (const char* filename);
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#endif /*USE_LDAP*/
|
2010-06-09 16:53:51 +00:00
|
|
|
|
static fingerprint_list_t parse_ocsp_signer (const char *string);
|
|
|
|
|
static void handle_connections (assuan_fd_t listen_fd);
|
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
/* NPth wrapper function definitions. */
|
|
|
|
|
ASSUAN_SYSTEM_NPTH_IMPL;
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
static const char *
|
|
|
|
|
my_strusage( int level )
|
|
|
|
|
{
|
|
|
|
|
const char *p;
|
2011-01-25 11:26:01 +01:00
|
|
|
|
switch ( level )
|
2010-06-09 16:53:51 +00:00
|
|
|
|
{
|
2013-11-18 14:09:47 +01:00
|
|
|
|
case 11: p = "@DIRMNGR@ (@GNUPG@)";
|
2010-06-09 16:53:51 +00:00
|
|
|
|
break;
|
|
|
|
|
case 13: p = VERSION; break;
|
|
|
|
|
case 17: p = PRINTABLE_OS_NAME; break;
|
|
|
|
|
/* 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. */
|
|
|
|
|
case 19: p = _("Please report bugs to <@EMAIL@>.\n"); break;
|
|
|
|
|
case 49: p = PACKAGE_BUGREPORT; break;
|
|
|
|
|
case 1:
|
2013-11-18 14:09:47 +01:00
|
|
|
|
case 40: p = _("Usage: @DIRMNGR@ [options] (-h for help)");
|
2010-06-09 16:53:51 +00:00
|
|
|
|
break;
|
2013-11-18 14:09:47 +01:00
|
|
|
|
case 41: p = _("Syntax: @DIRMNGR@ [options] [command [args]]\n"
|
2014-10-17 13:31:07 +02:00
|
|
|
|
"Keyserver, CRL, and OCSP access for @GNUPG@\n");
|
2010-06-09 16:53:51 +00:00
|
|
|
|
break;
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
default: p = NULL;
|
|
|
|
|
}
|
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Callback from libksba to hash a provided buffer. Our current
|
|
|
|
|
implementation does only allow SHA-1 for hashing. This may be
|
|
|
|
|
extended by mapping the name, testing for algorithm availibility
|
|
|
|
|
and adjust the length checks accordingly. */
|
2011-01-25 11:26:01 +01:00
|
|
|
|
static gpg_error_t
|
2010-06-09 16:53:51 +00:00
|
|
|
|
my_ksba_hash_buffer (void *arg, const char *oid,
|
|
|
|
|
const void *buffer, size_t length, size_t resultsize,
|
|
|
|
|
unsigned char *result, size_t *resultlen)
|
|
|
|
|
{
|
|
|
|
|
(void)arg;
|
|
|
|
|
|
2011-01-25 11:26:01 +01:00
|
|
|
|
if (oid && strcmp (oid, "1.3.14.3.2.26"))
|
|
|
|
|
return gpg_error (GPG_ERR_NOT_SUPPORTED);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
if (resultsize < 20)
|
|
|
|
|
return gpg_error (GPG_ERR_BUFFER_TOO_SHORT);
|
2011-01-25 11:26:01 +01:00
|
|
|
|
gcry_md_hash_buffer (2, result, buffer, length);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
*resultlen = 20;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2014-05-05 16:09:45 +02:00
|
|
|
|
/* GNUTLS log function callback. */
|
|
|
|
|
static void
|
|
|
|
|
my_gnutls_log (int level, const char *text)
|
|
|
|
|
{
|
|
|
|
|
int n;
|
|
|
|
|
|
|
|
|
|
n = strlen (text);
|
|
|
|
|
while (n && text[n-1] == '\n')
|
|
|
|
|
n--;
|
|
|
|
|
|
|
|
|
|
log_debug ("gnutls:L%d: %.*s\n", level, n, text);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
/* Setup the debugging. With a LEVEL of NULL only the active debug
|
|
|
|
|
flags are propagated to the subsystems. With LEVEL set, a specific
|
|
|
|
|
set of debug flags is set; thus overriding all flags already
|
|
|
|
|
set. */
|
|
|
|
|
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") || (numok && numlvl < 1))
|
|
|
|
|
opt.debug = 0;
|
|
|
|
|
else if (!strcmp (debug_level, "basic") || (numok && numlvl <= 2))
|
|
|
|
|
opt.debug = DBG_ASSUAN_VALUE;
|
|
|
|
|
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") || (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") || 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
|
2011-01-25 11:26:01 +01:00
|
|
|
|
disk with debug files which may reveal confidential data. */
|
2010-06-09 16:53:51 +00:00
|
|
|
|
if (numok)
|
|
|
|
|
opt.debug &= ~(DBG_HASHING_VALUE);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error (_("invalid debug-level '%s' given\n"), debug_level);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
log_info (_("valid debug levels are: %s\n"),
|
|
|
|
|
"none, basic, advanced, expert, guru");
|
|
|
|
|
opt.debug = 0; /* Reset debugging, so that prior debug
|
|
|
|
|
statements won't have an undesired effect. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (opt.debug && !opt.verbose)
|
|
|
|
|
{
|
|
|
|
|
opt.verbose = 1;
|
|
|
|
|
gcry_control (GCRYCTL_SET_VERBOSITY, (int)opt.verbose);
|
|
|
|
|
}
|
|
|
|
|
if (opt.debug && opt.quiet)
|
|
|
|
|
opt.quiet = 0;
|
|
|
|
|
|
|
|
|
|
if (opt.debug & DBG_CRYPTO_VALUE )
|
|
|
|
|
gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 1);
|
2014-05-05 16:09:45 +02:00
|
|
|
|
|
2014-10-02 17:33:57 +02:00
|
|
|
|
#if HTTP_USE_NTBTLS
|
|
|
|
|
if (opt_gnutls_debug >= 0)
|
|
|
|
|
{
|
|
|
|
|
ntbtls_set_debug (opt_gnutls_debug, NULL, NULL);
|
|
|
|
|
}
|
|
|
|
|
#elif HTTP_USE_GNUTLS
|
2014-05-05 16:09:45 +02:00
|
|
|
|
if (opt_gnutls_debug >= 0)
|
|
|
|
|
{
|
|
|
|
|
gnutls_global_set_log_function (my_gnutls_log);
|
|
|
|
|
gnutls_global_set_log_level (opt_gnutls_debug);
|
|
|
|
|
}
|
|
|
|
|
#endif /*HTTP_USE_GNUTLS*/
|
2010-06-09 16:53:51 +00:00
|
|
|
|
}
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
wrong_args (const char *text)
|
|
|
|
|
{
|
2013-11-18 14:09:47 +01:00
|
|
|
|
es_fprintf (es_stderr, _("usage: %s [options] "), DIRMNGR_NAME);
|
2010-07-16 13:19:45 +00:00
|
|
|
|
es_fputs (text, es_stderr);
|
|
|
|
|
es_putc ('\n', es_stderr);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
dirmngr_exit (2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Helper to stop the reaper thread for the ldap wrapper. */
|
|
|
|
|
static void
|
|
|
|
|
shutdown_reaper (void)
|
|
|
|
|
{
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#if USE_LDAP
|
2010-06-09 16:53:51 +00:00
|
|
|
|
ldap_wrapper_wait_connections ();
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#endif
|
2010-06-09 16:53:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Handle options which are allowed to be reset after program start.
|
|
|
|
|
Return true if the current option in PARGS could be handled and
|
|
|
|
|
false if not. As a special feature, passing a value of NULL for
|
|
|
|
|
PARGS, resets the options to the default. REREAD should be set
|
|
|
|
|
true if it is not the initial option parsing. */
|
|
|
|
|
static int
|
|
|
|
|
parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
|
|
|
|
|
{
|
|
|
|
|
if (!pargs)
|
|
|
|
|
{ /* Reset mode. */
|
|
|
|
|
opt.quiet = 0;
|
|
|
|
|
opt.verbose = 0;
|
|
|
|
|
opt.debug = 0;
|
|
|
|
|
opt.ldap_wrapper_program = NULL;
|
|
|
|
|
opt.disable_http = 0;
|
2011-01-25 11:26:01 +01:00
|
|
|
|
opt.disable_ldap = 0;
|
|
|
|
|
opt.honor_http_proxy = 0;
|
|
|
|
|
opt.http_proxy = NULL;
|
|
|
|
|
opt.ldap_proxy = NULL;
|
2010-06-09 16:53:51 +00:00
|
|
|
|
opt.only_ldap_proxy = 0;
|
|
|
|
|
opt.ignore_http_dp = 0;
|
|
|
|
|
opt.ignore_ldap_dp = 0;
|
|
|
|
|
opt.ignore_ocsp_service_url = 0;
|
|
|
|
|
opt.allow_ocsp = 0;
|
|
|
|
|
opt.ocsp_responder = NULL;
|
|
|
|
|
opt.ocsp_max_clock_skew = 10 * 60; /* 10 minutes. */
|
|
|
|
|
opt.ocsp_max_period = 90 * 86400; /* 90 days. */
|
|
|
|
|
opt.ocsp_current_period = 3 * 60 * 60; /* 3 hours. */
|
|
|
|
|
opt.max_replies = DEFAULT_MAX_REPLIES;
|
|
|
|
|
while (opt.ocsp_signer)
|
|
|
|
|
{
|
|
|
|
|
fingerprint_list_t tmp = opt.ocsp_signer->next;
|
|
|
|
|
xfree (opt.ocsp_signer);
|
|
|
|
|
opt.ocsp_signer = tmp;
|
|
|
|
|
}
|
|
|
|
|
FREE_STRLIST (opt.ignored_cert_extensions);
|
2014-05-05 16:09:45 +02:00
|
|
|
|
http_register_tls_ca (NULL);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
switch (pargs->r_opt)
|
|
|
|
|
{
|
|
|
|
|
case oQuiet: opt.quiet = 1; break;
|
|
|
|
|
case oVerbose: opt.verbose++; break;
|
|
|
|
|
case oDebug: opt.debug |= pargs->r.ret_ulong; break;
|
|
|
|
|
case oDebugAll: opt.debug = ~0; break;
|
|
|
|
|
case oDebugLevel: debug_level = pargs->r.ret_str; break;
|
2014-05-05 16:09:45 +02:00
|
|
|
|
case oGnutlsDebug: opt_gnutls_debug = pargs->r.ret_int; break;
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
case oLogFile:
|
|
|
|
|
if (!reread)
|
|
|
|
|
return 0; /* Not handled. */
|
|
|
|
|
if (!current_logfile || !pargs->r.ret_str
|
|
|
|
|
|| strcmp (current_logfile, pargs->r.ret_str))
|
|
|
|
|
{
|
|
|
|
|
log_set_file (pargs->r.ret_str);
|
|
|
|
|
xfree (current_logfile);
|
|
|
|
|
current_logfile = xtrystrdup (pargs->r.ret_str);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case oLDAPWrapperProgram:
|
|
|
|
|
opt.ldap_wrapper_program = pargs->r.ret_str;
|
|
|
|
|
break;
|
|
|
|
|
case oHTTPWrapperProgram:
|
|
|
|
|
opt.http_wrapper_program = pargs->r.ret_str;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case oDisableHTTP: opt.disable_http = 1; break;
|
|
|
|
|
case oDisableLDAP: opt.disable_ldap = 1; break;
|
|
|
|
|
case oHonorHTTPProxy: opt.honor_http_proxy = 1; break;
|
|
|
|
|
case oHTTPProxy: opt.http_proxy = pargs->r.ret_str; break;
|
|
|
|
|
case oLDAPProxy: opt.ldap_proxy = pargs->r.ret_str; break;
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
|
|
case oAllowOCSP: opt.allow_ocsp = 1; break;
|
|
|
|
|
case oOCSPResponder: opt.ocsp_responder = pargs->r.ret_str; break;
|
2011-01-25 11:26:01 +01:00
|
|
|
|
case oOCSPSigner:
|
2010-06-09 16:53:51 +00:00
|
|
|
|
opt.ocsp_signer = parse_ocsp_signer (pargs->r.ret_str);
|
|
|
|
|
break;
|
|
|
|
|
case oOCSPMaxClockSkew: opt.ocsp_max_clock_skew = pargs->r.ret_int; break;
|
|
|
|
|
case oOCSPMaxPeriod: opt.ocsp_max_period = pargs->r.ret_int; break;
|
|
|
|
|
case oOCSPCurrentPeriod: opt.ocsp_current_period = pargs->r.ret_int; break;
|
|
|
|
|
|
|
|
|
|
case oMaxReplies: opt.max_replies = pargs->r.ret_int; break;
|
|
|
|
|
|
2014-05-05 16:09:45 +02:00
|
|
|
|
case oHkpCaCert:
|
|
|
|
|
http_register_tls_ca (pargs->r.ret_str);
|
|
|
|
|
break;
|
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
case oIgnoreCertExtension:
|
|
|
|
|
add_to_strlist (&opt.ignored_cert_extensions, pargs->r.ret_str);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
return 0; /* Not handled. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 1; /* Handled. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-07-16 13:19:45 +00:00
|
|
|
|
#ifdef USE_W32_SERVICE
|
2010-06-09 16:53:51 +00:00
|
|
|
|
/* The global status of our service. */
|
|
|
|
|
SERVICE_STATUS_HANDLE service_handle;
|
|
|
|
|
SERVICE_STATUS service_status;
|
|
|
|
|
|
|
|
|
|
DWORD WINAPI
|
|
|
|
|
w32_service_control (DWORD control, DWORD event_type, LPVOID event_data,
|
|
|
|
|
LPVOID context)
|
|
|
|
|
{
|
2014-03-07 09:46:44 +01:00
|
|
|
|
(void)event_type;
|
|
|
|
|
(void)event_data;
|
|
|
|
|
(void)context;
|
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
/* event_type and event_data are not used here. */
|
|
|
|
|
switch (control)
|
|
|
|
|
{
|
|
|
|
|
case SERVICE_CONTROL_SHUTDOWN:
|
|
|
|
|
/* For shutdown we will try to force termination. */
|
|
|
|
|
service_status.dwCurrentState = SERVICE_STOP_PENDING;
|
2011-01-25 11:26:01 +01:00
|
|
|
|
SetServiceStatus (service_handle, &service_status);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
shutdown_pending = 3;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SERVICE_CONTROL_STOP:
|
|
|
|
|
service_status.dwCurrentState = SERVICE_STOP_PENDING;
|
2011-01-25 11:26:01 +01:00
|
|
|
|
SetServiceStatus (service_handle, &service_status);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
shutdown_pending = 1;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2010-07-16 13:19:45 +00:00
|
|
|
|
#endif /*USE_W32_SERVICE*/
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
|
|
|
|
static int
|
|
|
|
|
pid_suffix_callback (unsigned long *r_suffix)
|
|
|
|
|
{
|
|
|
|
|
union int_and_ptr_u value;
|
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
value.aptr = npth_getspecific (my_tlskey_current_fd);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
*r_suffix = value.aint;
|
|
|
|
|
return (*r_suffix != -1); /* Use decimal representation. */
|
|
|
|
|
}
|
|
|
|
|
#endif /*!HAVE_W32_SYSTEM*/
|
|
|
|
|
|
|
|
|
|
|
2010-07-16 13:19:45 +00:00
|
|
|
|
#ifdef USE_W32_SERVICE
|
|
|
|
|
# define main real_main
|
2010-06-09 16:53:51 +00:00
|
|
|
|
#endif
|
|
|
|
|
int
|
|
|
|
|
main (int argc, char **argv)
|
|
|
|
|
{
|
2010-07-16 13:19:45 +00:00
|
|
|
|
#ifdef USE_W32_SERVICE
|
|
|
|
|
# undef main
|
2010-06-09 16:53:51 +00:00
|
|
|
|
#endif
|
|
|
|
|
enum cmd_and_opt_values cmd = 0;
|
|
|
|
|
ARGPARSE_ARGS pargs;
|
|
|
|
|
int orig_argc;
|
|
|
|
|
char **orig_argv;
|
|
|
|
|
FILE *configfp = NULL;
|
|
|
|
|
char *configname = NULL;
|
|
|
|
|
const char *shell;
|
|
|
|
|
unsigned configlineno;
|
|
|
|
|
int parse_debug = 0;
|
|
|
|
|
int default_config =1;
|
|
|
|
|
int greeting = 0;
|
|
|
|
|
int nogreeting = 0;
|
|
|
|
|
int nodetach = 0;
|
|
|
|
|
int csh_style = 0;
|
|
|
|
|
char *logfile = NULL;
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#if USE_LDAP
|
2010-06-09 16:53:51 +00:00
|
|
|
|
char *ldapfile = NULL;
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#endif /*USE_LDAP*/
|
2010-06-09 16:53:51 +00:00
|
|
|
|
int debug_wait = 0;
|
|
|
|
|
int rc;
|
|
|
|
|
int homedir_seen = 0;
|
|
|
|
|
struct assuan_malloc_hooks malloc_hooks;
|
|
|
|
|
|
2010-07-16 13:19:45 +00:00
|
|
|
|
#ifdef USE_W32_SERVICE
|
2010-06-09 16:53:51 +00:00
|
|
|
|
/* The option will be set by main() below if we should run as a
|
|
|
|
|
system daemon. */
|
|
|
|
|
if (opt.system_service)
|
|
|
|
|
{
|
|
|
|
|
service_handle
|
|
|
|
|
= RegisterServiceCtrlHandlerEx ("DirMngr",
|
|
|
|
|
&w32_service_control, NULL /*FIXME*/);
|
|
|
|
|
if (service_handle == 0)
|
|
|
|
|
log_error ("failed to register service control handler: ec=%d",
|
|
|
|
|
(int) GetLastError ());
|
|
|
|
|
service_status.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
|
|
|
|
|
service_status.dwCurrentState = SERVICE_START_PENDING;
|
|
|
|
|
service_status.dwControlsAccepted
|
|
|
|
|
= SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
|
|
|
|
|
service_status.dwWin32ExitCode = NO_ERROR;
|
|
|
|
|
service_status.dwServiceSpecificExitCode = NO_ERROR;
|
|
|
|
|
service_status.dwCheckPoint = 0;
|
|
|
|
|
service_status.dwWaitHint = 10000; /* 10 seconds timeout. */
|
2011-01-25 11:26:01 +01:00
|
|
|
|
SetServiceStatus (service_handle, &service_status);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
}
|
2010-07-16 13:19:45 +00:00
|
|
|
|
#endif /*USE_W32_SERVICE*/
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
set_strusage (my_strusage);
|
2013-11-18 14:09:47 +01:00
|
|
|
|
log_set_prefix (DIRMNGR_NAME, 1|4);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
/* Make sure that our subsystems are ready. */
|
|
|
|
|
i18n_init ();
|
|
|
|
|
init_common_subsystems (&argc, &argv);
|
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_init ();
|
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
/* Check that the libraries are suitable. Do it here because
|
|
|
|
|
the option parsing may need services of the libraries. */
|
|
|
|
|
|
|
|
|
|
if (!gcry_check_version (NEED_LIBGCRYPT_VERSION) )
|
|
|
|
|
log_fatal (_("%s is too old (need %s, have %s)\n"), "libgcrypt",
|
|
|
|
|
NEED_LIBGCRYPT_VERSION, gcry_check_version (NULL) );
|
|
|
|
|
if (!ksba_check_version (NEED_KSBA_VERSION) )
|
|
|
|
|
log_fatal( _("%s is too old (need %s, have %s)\n"), "libksba",
|
|
|
|
|
NEED_KSBA_VERSION, ksba_check_version (NULL) );
|
|
|
|
|
|
|
|
|
|
ksba_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free );
|
|
|
|
|
ksba_set_hash_buffer_function (my_ksba_hash_buffer, NULL);
|
|
|
|
|
|
2014-10-02 17:33:57 +02:00
|
|
|
|
/* Init TLS library. */
|
|
|
|
|
#if HTTP_USE_NTBTLS
|
|
|
|
|
if (!ntbtls_check_version (NEED_NTBTLS_VERSION) )
|
|
|
|
|
log_fatal( _("%s is too old (need %s, have %s)\n"), "ntbtls",
|
|
|
|
|
NEED_NTBTLS_VERSION, ntbtls_check_version (NULL) );
|
|
|
|
|
#elif HTTP_USE_GNUTLS
|
2014-05-05 16:09:45 +02:00
|
|
|
|
rc = gnutls_global_init ();
|
|
|
|
|
if (rc)
|
|
|
|
|
log_fatal ("gnutls_global_init failed: %s\n", gnutls_strerror (rc));
|
|
|
|
|
#endif /*HTTP_USE_GNUTLS*/
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
/* Init Assuan. */
|
|
|
|
|
malloc_hooks.malloc = gcry_malloc;
|
|
|
|
|
malloc_hooks.realloc = gcry_realloc;
|
|
|
|
|
malloc_hooks.free = gcry_free;
|
|
|
|
|
assuan_set_malloc_hooks (&malloc_hooks);
|
|
|
|
|
assuan_set_assuan_log_prefix (log_get_prefix (NULL));
|
|
|
|
|
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
assuan_sock_init ();
|
|
|
|
|
setup_libassuan_logging (&opt.debug);
|
|
|
|
|
|
|
|
|
|
setup_libgcrypt_logging ();
|
|
|
|
|
|
|
|
|
|
/* Setup defaults. */
|
|
|
|
|
shell = getenv ("SHELL");
|
|
|
|
|
if (shell && strlen (shell) >= 3 && !strcmp (shell+strlen (shell)-3, "csh") )
|
|
|
|
|
csh_style = 1;
|
|
|
|
|
|
|
|
|
|
opt.homedir = default_homedir ();
|
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
/* Now with NPth running we can set the logging callback. Our
|
|
|
|
|
windows implementation does not yet feature the NPth TLS
|
2010-06-09 16:53:51 +00:00
|
|
|
|
functions. */
|
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
if (npth_key_create (&my_tlskey_current_fd, NULL) == 0)
|
|
|
|
|
if (npth_setspecific (my_tlskey_current_fd, NULL) == 0)
|
2010-06-09 16:53:51 +00:00
|
|
|
|
log_set_pid_suffix_cb (pid_suffix_callback);
|
|
|
|
|
#endif /*!HAVE_W32_SYSTEM*/
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
/* Reset rereadable options to default values. */
|
2011-01-25 11:26:01 +01:00
|
|
|
|
parse_rereadable_options (NULL, 0);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
/* LDAP defaults. */
|
|
|
|
|
opt.add_new_ldapservers = 0;
|
|
|
|
|
opt.ldaptimeout = DEFAULT_LDAP_TIMEOUT;
|
|
|
|
|
|
|
|
|
|
/* Other defaults. */
|
|
|
|
|
|
|
|
|
|
/* Check whether we have a config file given on the commandline */
|
|
|
|
|
orig_argc = argc;
|
|
|
|
|
orig_argv = argv;
|
|
|
|
|
pargs.argc = &argc;
|
|
|
|
|
pargs.argv = &argv;
|
|
|
|
|
pargs.flags= 1|(1<<6); /* do not remove the args, ignore version */
|
|
|
|
|
while (arg_parse( &pargs, opts))
|
|
|
|
|
{
|
|
|
|
|
if (pargs.r_opt == oDebug || pargs.r_opt == oDebugAll)
|
|
|
|
|
parse_debug++;
|
|
|
|
|
else if (pargs.r_opt == oOptions)
|
|
|
|
|
{ /* Yes there is one, so we do not try the default one, but
|
|
|
|
|
read the option file when it is encountered at the
|
|
|
|
|
commandline */
|
|
|
|
|
default_config = 0;
|
|
|
|
|
}
|
|
|
|
|
else if (pargs.r_opt == oNoOptions)
|
|
|
|
|
default_config = 0; /* --no-options */
|
|
|
|
|
else if (pargs.r_opt == oHomedir)
|
|
|
|
|
{
|
|
|
|
|
opt.homedir = pargs.r.ret_str;
|
|
|
|
|
homedir_seen = 1;
|
|
|
|
|
}
|
|
|
|
|
else if (pargs.r_opt == aDaemon)
|
|
|
|
|
opt.system_daemon = 1;
|
|
|
|
|
else if (pargs.r_opt == aService)
|
|
|
|
|
{
|
|
|
|
|
/* Redundant. The main function takes care of it. */
|
|
|
|
|
opt.system_service = 1;
|
|
|
|
|
opt.system_daemon = 1;
|
|
|
|
|
}
|
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
else if (pargs.r_opt == aGPGConfList || pargs.r_opt == aGPGConfTest)
|
|
|
|
|
/* We set this so we switch to the system configuration
|
|
|
|
|
directory below. This is a crutch to solve the problem
|
|
|
|
|
that the user configuration is never used on Windows. Also
|
|
|
|
|
see below at aGPGConfList. */
|
|
|
|
|
opt.system_daemon = 1;
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If --daemon has been given on the command line but not --homedir,
|
2014-03-12 18:24:52 +01:00
|
|
|
|
we switch to /etc/gnupg as default home directory. Note, that
|
2010-06-09 16:53:51 +00:00
|
|
|
|
this also overrides the GNUPGHOME environment variable. */
|
|
|
|
|
if (opt.system_daemon && !homedir_seen)
|
|
|
|
|
{
|
2010-12-14 12:10:28 +00:00
|
|
|
|
#ifdef HAVE_W32CE_SYSTEM
|
2011-01-25 13:44:27 +01:00
|
|
|
|
opt.homedir = DIRSEP_S "gnupg";
|
2010-12-14 12:10:28 +00:00
|
|
|
|
#else
|
2010-06-09 16:53:51 +00:00
|
|
|
|
opt.homedir = gnupg_sysconfdir ();
|
2010-12-14 12:10:28 +00:00
|
|
|
|
#endif
|
2010-06-09 16:53:51 +00:00
|
|
|
|
opt.homedir_data = gnupg_datadir ();
|
|
|
|
|
opt.homedir_cache = gnupg_cachedir ();
|
2014-03-12 19:33:30 +01:00
|
|
|
|
socket_name = dirmngr_sys_socket_name ();
|
2010-06-09 16:53:51 +00:00
|
|
|
|
}
|
2014-03-12 19:33:30 +01:00
|
|
|
|
else if (dirmngr_user_socket_name ())
|
|
|
|
|
socket_name = dirmngr_user_socket_name ();
|
|
|
|
|
else
|
|
|
|
|
socket_name = dirmngr_sys_socket_name ();
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
if (default_config)
|
2013-11-18 14:09:47 +01:00
|
|
|
|
configname = make_filename (opt.homedir, DIRMNGR_NAME".conf", NULL );
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
argc = orig_argc;
|
|
|
|
|
argv = orig_argv;
|
|
|
|
|
pargs.argc = &argc;
|
|
|
|
|
pargs.argv = &argv;
|
|
|
|
|
pargs.flags= 1; /* do not remove the args */
|
|
|
|
|
next_pass:
|
|
|
|
|
if (configname)
|
|
|
|
|
{
|
|
|
|
|
configlineno = 0;
|
|
|
|
|
configfp = fopen (configname, "r");
|
|
|
|
|
if (!configfp)
|
|
|
|
|
{
|
|
|
|
|
if (default_config)
|
|
|
|
|
{
|
|
|
|
|
if( parse_debug )
|
2014-10-10 15:29:42 +02:00
|
|
|
|
log_info (_("Note: no default option file '%s'\n"),
|
2010-06-09 16:53:51 +00:00
|
|
|
|
configname );
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error (_("option file '%s': %s\n"),
|
2010-06-09 16:53:51 +00:00
|
|
|
|
configname, strerror(errno) );
|
|
|
|
|
exit(2);
|
|
|
|
|
}
|
2011-01-25 11:26:01 +01:00
|
|
|
|
xfree (configname);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
configname = NULL;
|
|
|
|
|
}
|
|
|
|
|
if (parse_debug && configname )
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_info (_("reading options from '%s'\n"), configname );
|
2010-06-09 16:53:51 +00:00
|
|
|
|
default_config = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
while (optfile_parse( configfp, configname, &configlineno, &pargs, opts) )
|
|
|
|
|
{
|
|
|
|
|
if (parse_rereadable_options (&pargs, 0))
|
|
|
|
|
continue; /* Already handled */
|
|
|
|
|
switch (pargs.r_opt)
|
|
|
|
|
{
|
2011-01-25 11:26:01 +01:00
|
|
|
|
case aServer:
|
2010-06-09 16:53:51 +00:00
|
|
|
|
case aDaemon:
|
|
|
|
|
case aService:
|
2011-01-25 11:26:01 +01:00
|
|
|
|
case aShutdown:
|
|
|
|
|
case aFlush:
|
|
|
|
|
case aListCRLs:
|
|
|
|
|
case aLoadCRL:
|
2010-06-09 16:53:51 +00:00
|
|
|
|
case aFetchCRL:
|
|
|
|
|
case aGPGConfList:
|
|
|
|
|
case aGPGConfTest:
|
|
|
|
|
cmd = pargs.r_opt;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case oQuiet: opt.quiet = 1; break;
|
|
|
|
|
case oVerbose: opt.verbose++; break;
|
|
|
|
|
case oBatch: opt.batch=1; break;
|
|
|
|
|
|
|
|
|
|
case oDebug: opt.debug |= pargs.r.ret_ulong; break;
|
|
|
|
|
case oDebugAll: opt.debug = ~0; break;
|
|
|
|
|
case oDebugLevel: debug_level = pargs.r.ret_str; break;
|
|
|
|
|
case oDebugWait: debug_wait = pargs.r.ret_int; break;
|
|
|
|
|
|
|
|
|
|
case oOptions:
|
|
|
|
|
/* Config files may not be nested (silently ignore them) */
|
|
|
|
|
if (!configfp)
|
|
|
|
|
{
|
|
|
|
|
xfree(configname);
|
|
|
|
|
configname = xstrdup(pargs.r.ret_str);
|
|
|
|
|
goto next_pass;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case oNoGreeting: nogreeting = 1; break;
|
|
|
|
|
case oNoVerbose: opt.verbose = 0; break;
|
|
|
|
|
case oNoOptions: break; /* no-options */
|
|
|
|
|
case oHomedir: /* Ignore this option here. */; break;
|
|
|
|
|
case oNoDetach: nodetach = 1; break;
|
|
|
|
|
case oLogFile: logfile = pargs.r.ret_str; break;
|
|
|
|
|
case oCsh: csh_style = 1; break;
|
|
|
|
|
case oSh: csh_style = 0; break;
|
2014-10-17 15:59:45 +02:00
|
|
|
|
case oLDAPFile:
|
|
|
|
|
# if USE_LDAP
|
|
|
|
|
ldapfile = pargs.r.ret_str;
|
|
|
|
|
# endif /*USE_LDAP*/
|
|
|
|
|
break;
|
2010-06-09 16:53:51 +00:00
|
|
|
|
case oLDAPAddServers: opt.add_new_ldapservers = 1; break;
|
2011-01-25 11:26:01 +01:00
|
|
|
|
case oLDAPTimeout:
|
|
|
|
|
opt.ldaptimeout = pargs.r.ret_int;
|
2010-06-09 16:53:51 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case oFakedSystemTime:
|
|
|
|
|
gnupg_set_time ((time_t)pargs.r.ret_ulong, 0);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case oForce: opt.force = 1; break;
|
|
|
|
|
|
|
|
|
|
case oSocketName: socket_name = pargs.r.ret_str; break;
|
|
|
|
|
|
|
|
|
|
default : pargs.err = configfp? 1:2; break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (configfp)
|
|
|
|
|
{
|
2010-07-16 13:19:45 +00:00
|
|
|
|
fclose (configfp);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
configfp = NULL;
|
|
|
|
|
/* Keep a copy of the name so that it can be read on SIGHUP. */
|
|
|
|
|
opt.config_filename = configname;
|
|
|
|
|
configname = NULL;
|
|
|
|
|
goto next_pass;
|
|
|
|
|
}
|
|
|
|
|
xfree (configname);
|
|
|
|
|
configname = NULL;
|
|
|
|
|
if (log_get_errorcount(0))
|
|
|
|
|
exit(2);
|
|
|
|
|
if (nogreeting )
|
|
|
|
|
greeting = 0;
|
|
|
|
|
|
|
|
|
|
if (!opt.homedir_data)
|
|
|
|
|
opt.homedir_data = opt.homedir;
|
|
|
|
|
if (!opt.homedir_cache)
|
|
|
|
|
opt.homedir_cache = opt.homedir;
|
|
|
|
|
|
|
|
|
|
if (greeting)
|
|
|
|
|
{
|
2010-07-16 13:19:45 +00:00
|
|
|
|
es_fprintf (es_stderr, "%s %s; %s\n",
|
|
|
|
|
strusage(11), strusage(13), strusage(14) );
|
|
|
|
|
es_fprintf (es_stderr, "%s\n", strusage(15) );
|
2010-06-09 16:53:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef IS_DEVELOPMENT_VERSION
|
|
|
|
|
log_info ("NOTE: this is a development version!\n");
|
|
|
|
|
#endif
|
|
|
|
|
|
2012-03-27 12:35:13 +02:00
|
|
|
|
/* Print a warning if an argument looks like an option. */
|
|
|
|
|
if (!opt.quiet && !(pargs.flags & ARGPARSE_FLAG_STOP_SEEN))
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i=0; i < argc; i++)
|
|
|
|
|
if (argv[i][0] == '-' && argv[i][1] == '-')
|
2014-10-10 15:29:42 +02:00
|
|
|
|
log_info (_("Note: '%s' is not considered an option\n"), argv[i]);
|
2012-03-27 12:35:13 +02:00
|
|
|
|
}
|
|
|
|
|
|
2013-11-18 14:09:47 +01:00
|
|
|
|
if (!access ("/etc/"DIRMNGR_NAME, F_OK) && !strncmp (opt.homedir, "/etc/", 5))
|
2011-01-25 11:26:01 +01:00
|
|
|
|
log_info
|
2013-11-18 14:09:47 +01:00
|
|
|
|
("NOTE: DirMngr is now a proper part of %s. The configuration and"
|
2010-07-16 13:19:45 +00:00
|
|
|
|
" other directory names changed. Please check that no other version"
|
|
|
|
|
" of dirmngr is still installed. To disable this warning, remove the"
|
2013-11-18 14:09:47 +01:00
|
|
|
|
" directory '/etc/dirmngr'.\n", GNUPG_NAME);
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
if (gnupg_faked_time_p ())
|
|
|
|
|
{
|
2010-10-21 08:52:23 +00:00
|
|
|
|
gnupg_isotime_t tbuf;
|
|
|
|
|
|
2010-10-21 08:23:29 +00:00
|
|
|
|
log_info (_("WARNING: running with faked system time: "));
|
2010-06-09 16:53:51 +00:00
|
|
|
|
gnupg_get_isotime (tbuf);
|
2010-10-21 08:23:29 +00:00
|
|
|
|
dump_isotime (tbuf);
|
|
|
|
|
log_printf ("\n");
|
2010-06-09 16:53:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
set_debug ();
|
|
|
|
|
|
|
|
|
|
/* Get LDAP server list from file. */
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#if USE_LDAP
|
2011-01-25 11:26:01 +01:00
|
|
|
|
if (!ldapfile)
|
2010-06-09 16:53:51 +00:00
|
|
|
|
{
|
|
|
|
|
ldapfile = make_filename (opt.homedir,
|
|
|
|
|
opt.system_daemon?
|
|
|
|
|
"ldapservers.conf":"dirmngr_ldapservers.conf",
|
|
|
|
|
NULL);
|
|
|
|
|
opt.ldapservers = parse_ldapserver_file (ldapfile);
|
|
|
|
|
xfree (ldapfile);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
opt.ldapservers = parse_ldapserver_file (ldapfile);
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#endif /*USE_LDAP*/
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
|
|
|
|
/* We need to ignore the PIPE signal because the we might log to a
|
|
|
|
|
socket and that code handles EPIPE properly. The ldap wrapper
|
|
|
|
|
also requires us to ignore this silly signal. Assuan would set
|
|
|
|
|
this signal to ignore anyway.*/
|
|
|
|
|
signal (SIGPIPE, SIG_IGN);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Ready. Now to our duties. */
|
|
|
|
|
if (!cmd && opt.system_service)
|
|
|
|
|
cmd = aDaemon;
|
|
|
|
|
else if (!cmd)
|
|
|
|
|
cmd = aServer;
|
|
|
|
|
rc = 0;
|
|
|
|
|
|
|
|
|
|
if (cmd == aServer)
|
|
|
|
|
{
|
2014-03-12 18:24:52 +01:00
|
|
|
|
/* Note that this server mode is mainly useful for debugging. */
|
2010-06-09 16:53:51 +00:00
|
|
|
|
if (argc)
|
|
|
|
|
wrong_args ("--server");
|
|
|
|
|
|
|
|
|
|
if (logfile)
|
|
|
|
|
{
|
|
|
|
|
log_set_file (logfile);
|
|
|
|
|
log_set_prefix (NULL, 2|4);
|
|
|
|
|
}
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
if (debug_wait)
|
|
|
|
|
{
|
|
|
|
|
log_debug ("waiting for debugger - my pid is %u .....\n",
|
|
|
|
|
(unsigned int)getpid());
|
|
|
|
|
gnupg_sleep (debug_wait);
|
|
|
|
|
log_debug ("... okay\n");
|
|
|
|
|
}
|
|
|
|
|
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#if USE_LDAP
|
2010-07-23 16:16:14 +00:00
|
|
|
|
ldap_wrapper_launch_thread ();
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#endif /*USE_LDAP*/
|
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
cert_cache_init ();
|
|
|
|
|
crl_cache_init ();
|
|
|
|
|
start_command_handler (ASSUAN_INVALID_FD);
|
|
|
|
|
shutdown_reaper ();
|
|
|
|
|
}
|
|
|
|
|
else if (cmd == aDaemon)
|
|
|
|
|
{
|
|
|
|
|
assuan_fd_t fd;
|
|
|
|
|
pid_t pid;
|
|
|
|
|
int len;
|
|
|
|
|
struct sockaddr_un serv_addr;
|
|
|
|
|
|
|
|
|
|
if (argc)
|
|
|
|
|
wrong_args ("--daemon");
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
/* Now start with logging to a file if this is desired. */
|
|
|
|
|
if (logfile)
|
|
|
|
|
{
|
|
|
|
|
log_set_file (logfile);
|
|
|
|
|
log_set_prefix (NULL, (JNLIB_LOG_WITH_PREFIX
|
|
|
|
|
|JNLIB_LOG_WITH_TIME
|
|
|
|
|
|JNLIB_LOG_WITH_PID));
|
|
|
|
|
current_logfile = xstrdup (logfile);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
|
|
|
|
if (strchr (socket_name, ':'))
|
|
|
|
|
{
|
|
|
|
|
log_error (_("colons are not allowed in the socket name\n"));
|
|
|
|
|
dirmngr_exit (1);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
fd = assuan_sock_new (AF_UNIX, SOCK_STREAM, 0);
|
|
|
|
|
if (fd == ASSUAN_INVALID_FD)
|
|
|
|
|
{
|
|
|
|
|
log_error (_("can't create socket: %s\n"), strerror (errno));
|
|
|
|
|
cleanup ();
|
|
|
|
|
dirmngr_exit (1);
|
|
|
|
|
}
|
|
|
|
|
|
2014-12-01 09:50:55 +01:00
|
|
|
|
#if ASSUAN_VERSION_NUMBER >= 0x020104 /* >= 2.1.4 */
|
|
|
|
|
{
|
|
|
|
|
int redirected;
|
|
|
|
|
|
|
|
|
|
if (assuan_sock_set_sockaddr_un (socket_name,
|
|
|
|
|
(struct sockaddr*)&serv_addr,
|
|
|
|
|
&redirected))
|
|
|
|
|
{
|
|
|
|
|
if (errno == ENAMETOOLONG)
|
|
|
|
|
log_error (_("socket name '%s' is too long\n"), socket_name);
|
|
|
|
|
else
|
|
|
|
|
log_error ("error preparing socket '%s': %s\n",
|
|
|
|
|
socket_name,
|
|
|
|
|
gpg_strerror (gpg_error_from_syserror ()));
|
|
|
|
|
dirmngr_exit (1);
|
|
|
|
|
}
|
|
|
|
|
if (redirected)
|
|
|
|
|
{
|
|
|
|
|
redir_socket_name = xstrdup (serv_addr.sun_path);
|
|
|
|
|
if (opt.verbose)
|
|
|
|
|
log_info ("redirecting socket '%s' to '%s'\n",
|
|
|
|
|
socket_name, redir_socket_name);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#else /* Assuan < 2.1.4 */
|
2010-06-09 16:53:51 +00:00
|
|
|
|
memset (&serv_addr, 0, sizeof serv_addr);
|
|
|
|
|
serv_addr.sun_family = AF_UNIX;
|
2014-12-01 09:50:55 +01:00
|
|
|
|
if (strlen (socket_name)+1 >= sizeof serv_addr.sun_path )
|
|
|
|
|
{
|
|
|
|
|
log_error (_("socket name '%s' is too long\n"), socket_name);
|
|
|
|
|
dirmngr_exit (1);
|
|
|
|
|
}
|
2010-06-09 16:53:51 +00:00
|
|
|
|
strcpy (serv_addr.sun_path, socket_name);
|
2014-12-01 09:50:55 +01:00
|
|
|
|
#endif /* Assuan < 2.1.4 */
|
|
|
|
|
|
2010-08-06 13:52:01 +00:00
|
|
|
|
len = SUN_LEN (&serv_addr);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
rc = assuan_sock_bind (fd, (struct sockaddr*) &serv_addr, len);
|
2011-01-25 11:26:01 +01:00
|
|
|
|
if (rc == -1
|
2010-08-06 13:52:01 +00:00
|
|
|
|
&& (errno == EADDRINUSE
|
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
|| errno == EEXIST
|
|
|
|
|
#endif
|
|
|
|
|
))
|
2010-06-09 16:53:51 +00:00
|
|
|
|
{
|
2010-08-06 13:52:01 +00:00
|
|
|
|
/* Fixme: We should test whether a dirmngr is already running. */
|
2014-12-01 09:50:55 +01:00
|
|
|
|
gnupg_remove (redir_socket_name? redir_socket_name : socket_name);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
rc = assuan_sock_bind (fd, (struct sockaddr*) &serv_addr, len);
|
|
|
|
|
}
|
2011-01-25 11:26:01 +01:00
|
|
|
|
if (rc != -1
|
2010-06-09 16:53:51 +00:00
|
|
|
|
&& (rc = assuan_sock_get_nonce ((struct sockaddr*) &serv_addr, len, &socket_nonce)))
|
|
|
|
|
log_error (_("error getting nonce for the socket\n"));
|
|
|
|
|
if (rc == -1)
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error (_("error binding socket to '%s': %s\n"),
|
2014-12-01 09:50:55 +01:00
|
|
|
|
serv_addr.sun_path,
|
|
|
|
|
gpg_strerror (gpg_error_from_errno (errno)));
|
2010-06-09 16:53:51 +00:00
|
|
|
|
assuan_sock_close (fd);
|
|
|
|
|
dirmngr_exit (1);
|
|
|
|
|
}
|
|
|
|
|
cleanup_socket = 1;
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
if (listen (FD2INT (fd), 5) == -1)
|
|
|
|
|
{
|
|
|
|
|
log_error (_("listen() failed: %s\n"), strerror (errno));
|
|
|
|
|
assuan_sock_close (fd);
|
|
|
|
|
dirmngr_exit (1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (opt.verbose)
|
2014-12-01 09:50:55 +01:00
|
|
|
|
log_info (_("listening on socket '%s'\n"), serv_addr.sun_path);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
2010-07-16 13:19:45 +00:00
|
|
|
|
es_fflush (NULL);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
2010-08-16 11:03:43 +00:00
|
|
|
|
/* Note: We keep the dirmngr_info output only for the sake of
|
|
|
|
|
existing scripts which might use this to detect a successful
|
|
|
|
|
start of the dirmngr. */
|
2010-06-09 16:53:51 +00:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2014-03-07 09:46:44 +01:00
|
|
|
|
(void)csh_style;
|
|
|
|
|
(void)nodetach;
|
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
pid = getpid ();
|
2013-11-18 14:09:47 +01:00
|
|
|
|
es_printf ("set %s=%s;%lu;1\n",
|
|
|
|
|
DIRMNGR_INFO_NAME, socket_name, (ulong) pid);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
#else
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
pid = fork();
|
2011-01-25 11:26:01 +01:00
|
|
|
|
if (pid == (pid_t)-1)
|
2010-06-09 16:53:51 +00:00
|
|
|
|
{
|
2010-10-21 08:23:29 +00:00
|
|
|
|
log_fatal (_("error forking process: %s\n"), strerror (errno));
|
2010-06-09 16:53:51 +00:00
|
|
|
|
dirmngr_exit (1);
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-25 11:26:01 +01:00
|
|
|
|
if (pid)
|
2010-06-09 16:53:51 +00:00
|
|
|
|
{ /* We are the parent */
|
|
|
|
|
char *infostr;
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
/* Don't let cleanup() remove the socket - the child is
|
|
|
|
|
responsible for doing that. */
|
|
|
|
|
cleanup_socket = 0;
|
|
|
|
|
|
|
|
|
|
close (fd);
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
/* Create the info string: <name>:<pid>:<protocol_version> */
|
2013-11-18 14:09:47 +01:00
|
|
|
|
if (asprintf (&infostr, "%s=%s:%lu:1",
|
2014-12-01 09:50:55 +01:00
|
|
|
|
DIRMNGR_INFO_NAME, serv_addr.sun_path, (ulong)pid ) < 0)
|
2010-06-09 16:53:51 +00:00
|
|
|
|
{
|
|
|
|
|
log_error (_("out of core\n"));
|
|
|
|
|
kill (pid, SIGTERM);
|
|
|
|
|
dirmngr_exit (1);
|
|
|
|
|
}
|
|
|
|
|
/* Print the environment string, so that the caller can use
|
2010-08-16 11:03:43 +00:00
|
|
|
|
shell's eval to set it. But see above. */
|
2010-06-09 16:53:51 +00:00
|
|
|
|
if (csh_style)
|
|
|
|
|
{
|
|
|
|
|
*strchr (infostr, '=') = ' ';
|
2012-01-03 11:14:14 +01:00
|
|
|
|
es_printf ( "setenv %s;\n", infostr);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2013-11-18 14:09:47 +01:00
|
|
|
|
es_printf ( "%s; export %s;\n", infostr, DIRMNGR_INFO_NAME);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
}
|
|
|
|
|
free (infostr);
|
2011-01-25 11:26:01 +01:00
|
|
|
|
exit (0);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
/*NEVER REACHED*/
|
|
|
|
|
} /* end parent */
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2010-06-09 16:53:51 +00:00
|
|
|
|
This is the child
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/* Detach from tty and put process into a new session */
|
|
|
|
|
if (!nodetach )
|
2011-01-25 11:26:01 +01:00
|
|
|
|
{
|
2010-06-09 16:53:51 +00:00
|
|
|
|
int i;
|
|
|
|
|
unsigned int oldflags;
|
|
|
|
|
|
|
|
|
|
/* Close stdin, stdout and stderr unless it is the log stream */
|
|
|
|
|
for (i=0; i <= 2; i++)
|
|
|
|
|
{
|
|
|
|
|
if (!log_test_fd (i) && i != fd )
|
|
|
|
|
close (i);
|
|
|
|
|
}
|
|
|
|
|
if (setsid() == -1)
|
|
|
|
|
{
|
2010-10-21 08:23:29 +00:00
|
|
|
|
log_error ("setsid() failed: %s\n", strerror(errno) );
|
2010-06-09 16:53:51 +00:00
|
|
|
|
dirmngr_exit (1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
log_get_prefix (&oldflags);
|
|
|
|
|
log_set_prefix (NULL, oldflags | JNLIB_LOG_RUN_DETACHED);
|
|
|
|
|
opt.running_detached = 1;
|
|
|
|
|
|
|
|
|
|
if (chdir("/"))
|
|
|
|
|
{
|
2010-10-21 08:23:29 +00:00
|
|
|
|
log_error ("chdir to / failed: %s\n", strerror (errno));
|
2010-06-09 16:53:51 +00:00
|
|
|
|
dirmngr_exit (1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#if USE_LDAP
|
2010-07-23 16:16:14 +00:00
|
|
|
|
ldap_wrapper_launch_thread ();
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#endif /*USE_LDAP*/
|
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
cert_cache_init ();
|
|
|
|
|
crl_cache_init ();
|
2010-07-16 13:19:45 +00:00
|
|
|
|
#ifdef USE_W32_SERVICE
|
2010-06-09 16:53:51 +00:00
|
|
|
|
if (opt.system_service)
|
|
|
|
|
{
|
|
|
|
|
service_status.dwCurrentState = SERVICE_RUNNING;
|
|
|
|
|
SetServiceStatus (service_handle, &service_status);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
handle_connections (fd);
|
|
|
|
|
assuan_sock_close (fd);
|
|
|
|
|
shutdown_reaper ();
|
2010-07-16 13:19:45 +00:00
|
|
|
|
#ifdef USE_W32_SERVICE
|
2010-06-09 16:53:51 +00:00
|
|
|
|
if (opt.system_service)
|
|
|
|
|
{
|
|
|
|
|
service_status.dwCurrentState = SERVICE_STOPPED;
|
|
|
|
|
SetServiceStatus (service_handle, &service_status);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
else if (cmd == aListCRLs)
|
|
|
|
|
{
|
|
|
|
|
/* Just list the CRL cache and exit. */
|
|
|
|
|
if (argc)
|
|
|
|
|
wrong_args ("--list-crls");
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#if USE_LDAP
|
2010-07-23 16:16:14 +00:00
|
|
|
|
ldap_wrapper_launch_thread ();
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#endif /*USE_LDAP*/
|
2010-06-09 16:53:51 +00:00
|
|
|
|
crl_cache_init ();
|
2010-07-16 13:19:45 +00:00
|
|
|
|
crl_cache_list (es_stdout);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
}
|
|
|
|
|
else if (cmd == aLoadCRL)
|
|
|
|
|
{
|
|
|
|
|
struct server_control_s ctrlbuf;
|
|
|
|
|
|
|
|
|
|
memset (&ctrlbuf, 0, sizeof ctrlbuf);
|
|
|
|
|
dirmngr_init_default_ctrl (&ctrlbuf);
|
|
|
|
|
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#if USE_LDAP
|
2010-07-23 16:16:14 +00:00
|
|
|
|
ldap_wrapper_launch_thread ();
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#endif /*USE_LDAP*/
|
2010-06-09 16:53:51 +00:00
|
|
|
|
cert_cache_init ();
|
|
|
|
|
crl_cache_init ();
|
|
|
|
|
if (!argc)
|
|
|
|
|
rc = crl_cache_load (&ctrlbuf, NULL);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
for (; !rc && argc; argc--, argv++)
|
|
|
|
|
rc = crl_cache_load (&ctrlbuf, *argv);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (cmd == aFetchCRL)
|
|
|
|
|
{
|
|
|
|
|
ksba_reader_t reader;
|
|
|
|
|
struct server_control_s ctrlbuf;
|
|
|
|
|
|
|
|
|
|
if (argc != 1)
|
|
|
|
|
wrong_args ("--fetch-crl URL");
|
|
|
|
|
|
|
|
|
|
memset (&ctrlbuf, 0, sizeof ctrlbuf);
|
|
|
|
|
dirmngr_init_default_ctrl (&ctrlbuf);
|
|
|
|
|
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#if USE_LDAP
|
2010-07-23 16:16:14 +00:00
|
|
|
|
ldap_wrapper_launch_thread ();
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#endif /*USE_LDAP*/
|
2010-06-09 16:53:51 +00:00
|
|
|
|
cert_cache_init ();
|
|
|
|
|
crl_cache_init ();
|
|
|
|
|
rc = crl_fetch (&ctrlbuf, argv[0], &reader);
|
|
|
|
|
if (rc)
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error (_("fetching CRL from '%s' failed: %s\n"),
|
2010-06-09 16:53:51 +00:00
|
|
|
|
argv[0], gpg_strerror (rc));
|
|
|
|
|
else
|
|
|
|
|
{
|
2011-01-25 11:26:01 +01:00
|
|
|
|
rc = crl_cache_insert (&ctrlbuf, argv[0], reader);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
if (rc)
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error (_("processing CRL from '%s' failed: %s\n"),
|
2010-06-09 16:53:51 +00:00
|
|
|
|
argv[0], gpg_strerror (rc));
|
|
|
|
|
crl_close_reader (reader);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (cmd == aFlush)
|
|
|
|
|
{
|
|
|
|
|
/* Delete cache and exit. */
|
|
|
|
|
if (argc)
|
|
|
|
|
wrong_args ("--flush");
|
|
|
|
|
rc = crl_cache_flush();
|
|
|
|
|
}
|
|
|
|
|
else if (cmd == aGPGConfTest)
|
|
|
|
|
dirmngr_exit (0);
|
|
|
|
|
else if (cmd == aGPGConfList)
|
|
|
|
|
{
|
|
|
|
|
unsigned long flags = 0;
|
|
|
|
|
char *filename;
|
|
|
|
|
char *filename_esc;
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
/* On Windows systems, dirmngr always runs as system daemon, and
|
|
|
|
|
the per-user configuration is never used. So we short-cut
|
|
|
|
|
everything to use the global system configuration of dirmngr
|
|
|
|
|
above, and here we set the no change flag to make these
|
|
|
|
|
read-only. */
|
|
|
|
|
flags |= GC_OPT_FLAG_NO_CHANGE;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* First the configuration file. This is not an option, but it
|
|
|
|
|
is vital information for GPG Conf. */
|
|
|
|
|
if (!opt.config_filename)
|
|
|
|
|
opt.config_filename = make_filename (opt.homedir,
|
|
|
|
|
"dirmngr.conf", NULL );
|
|
|
|
|
|
|
|
|
|
filename = percent_escape (opt.config_filename, NULL);
|
2011-01-19 16:29:30 +01:00
|
|
|
|
es_printf ("gpgconf-dirmngr.conf:%lu:\"%s\n",
|
2010-06-09 16:53:51 +00:00
|
|
|
|
GC_OPT_FLAG_DEFAULT, filename);
|
|
|
|
|
xfree (filename);
|
|
|
|
|
|
2011-01-19 16:29:30 +01:00
|
|
|
|
es_printf ("verbose:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
|
|
|
|
es_printf ("quiet:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
|
|
|
|
es_printf ("debug-level:%lu:\"none\n", flags | GC_OPT_FLAG_DEFAULT);
|
|
|
|
|
es_printf ("log-file:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
|
|
|
|
es_printf ("force:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
/* --csh and --sh are mutually exclusive, something we can not
|
|
|
|
|
express in GPG Conf. --options is only usable from the
|
|
|
|
|
command line, really. --debug-all interacts with --debug,
|
|
|
|
|
and having both of them is thus problematic. --no-detach is
|
|
|
|
|
also only usable on the command line. --batch is unused. */
|
|
|
|
|
|
2011-01-25 11:26:01 +01:00
|
|
|
|
filename = make_filename (opt.homedir,
|
2010-06-09 16:53:51 +00:00
|
|
|
|
opt.system_daemon?
|
|
|
|
|
"ldapservers.conf":"dirmngr_ldapservers.conf",
|
|
|
|
|
NULL);
|
|
|
|
|
filename_esc = percent_escape (filename, NULL);
|
2011-01-19 16:29:30 +01:00
|
|
|
|
es_printf ("ldapserverlist-file:%lu:\"%s\n", flags | GC_OPT_FLAG_DEFAULT,
|
2010-06-09 16:53:51 +00:00
|
|
|
|
filename_esc);
|
|
|
|
|
xfree (filename_esc);
|
|
|
|
|
xfree (filename);
|
|
|
|
|
|
2011-01-19 16:29:30 +01:00
|
|
|
|
es_printf ("ldaptimeout:%lu:%u\n",
|
2010-06-09 16:53:51 +00:00
|
|
|
|
flags | GC_OPT_FLAG_DEFAULT, DEFAULT_LDAP_TIMEOUT);
|
2011-01-19 16:29:30 +01:00
|
|
|
|
es_printf ("max-replies:%lu:%u\n",
|
2010-06-09 16:53:51 +00:00
|
|
|
|
flags | GC_OPT_FLAG_DEFAULT, DEFAULT_MAX_REPLIES);
|
2011-01-19 16:29:30 +01:00
|
|
|
|
es_printf ("allow-ocsp:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
|
|
|
|
es_printf ("ocsp-responder:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
|
|
|
|
es_printf ("ocsp-signer:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
|
|
|
|
|
|
|
|
|
es_printf ("faked-system-time:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
|
|
|
|
es_printf ("no-greeting:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
|
|
|
|
|
|
|
|
|
es_printf ("disable-http:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
|
|
|
|
es_printf ("disable-ldap:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
|
|
|
|
es_printf ("honor-http-proxy:%lu\n", flags | GC_OPT_FLAG_NONE);
|
|
|
|
|
es_printf ("http-proxy:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
|
|
|
|
es_printf ("ldap-proxy:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
|
|
|
|
es_printf ("only-ldap-proxy:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
|
|
|
|
es_printf ("ignore-ldap-dp:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
|
|
|
|
es_printf ("ignore-http-dp:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
|
|
|
|
es_printf ("ignore-ocsp-service-url:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
/* Note: The next one is to fix a typo in gpgconf - should be
|
|
|
|
|
removed eventually. */
|
2011-01-19 16:29:30 +01:00
|
|
|
|
es_printf ("ignore-ocsp-servic-url:%lu:\n", flags | GC_OPT_FLAG_NONE);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
}
|
|
|
|
|
cleanup ();
|
|
|
|
|
return !!rc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-07-16 13:19:45 +00:00
|
|
|
|
#ifdef USE_W32_SERVICE
|
2014-03-07 09:46:44 +01:00
|
|
|
|
static void WINAPI
|
|
|
|
|
call_real_main (DWORD argc, LPSTR *argv)
|
|
|
|
|
{
|
|
|
|
|
real_main (argc, argv);
|
|
|
|
|
}
|
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
int
|
|
|
|
|
main (int argc, char *argv[])
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
/* Find out if we run in daemon mode or on the command line. */
|
|
|
|
|
for (i = 1; i < argc; i++)
|
|
|
|
|
if (!strcmp (argv[i], "--service"))
|
|
|
|
|
{
|
|
|
|
|
opt.system_service = 1;
|
|
|
|
|
opt.system_daemon = 1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!opt.system_service)
|
|
|
|
|
return real_main (argc, argv);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
SERVICE_TABLE_ENTRY DispatchTable [] =
|
|
|
|
|
{
|
2014-03-07 09:46:44 +01:00
|
|
|
|
{ "DirMngr", &call_real_main },
|
2010-06-09 16:53:51 +00:00
|
|
|
|
{ NULL, NULL }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if (!StartServiceCtrlDispatcher (DispatchTable))
|
|
|
|
|
return 1;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
2010-07-16 13:19:45 +00:00
|
|
|
|
#endif /*USE_W32_SERVICE*/
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
cleanup (void)
|
|
|
|
|
{
|
|
|
|
|
crl_cache_deinit ();
|
|
|
|
|
cert_cache_deinit (1);
|
|
|
|
|
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#if USE_LDAP
|
2010-06-09 16:53:51 +00:00
|
|
|
|
ldapserver_list_free (opt.ldapservers);
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#endif /*USE_LDAP*/
|
2010-06-09 16:53:51 +00:00
|
|
|
|
opt.ldapservers = NULL;
|
|
|
|
|
|
|
|
|
|
if (cleanup_socket)
|
|
|
|
|
{
|
|
|
|
|
cleanup_socket = 0;
|
2014-12-01 09:50:55 +01:00
|
|
|
|
if (redir_socket_name)
|
|
|
|
|
gnupg_remove (redir_socket_name);
|
|
|
|
|
else if (socket_name && *socket_name)
|
2010-07-16 13:19:45 +00:00
|
|
|
|
gnupg_remove (socket_name);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-01-25 11:26:01 +01:00
|
|
|
|
void
|
2010-06-09 16:53:51 +00:00
|
|
|
|
dirmngr_exit (int rc)
|
|
|
|
|
{
|
|
|
|
|
cleanup ();
|
|
|
|
|
exit (rc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
dirmngr_init_default_ctrl (ctrl_t ctrl)
|
|
|
|
|
{
|
|
|
|
|
(void)ctrl;
|
|
|
|
|
|
|
|
|
|
/* Nothing for now. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Create a list of LDAP servers from the file FILENAME. Returns the
|
2011-01-25 11:26:01 +01:00
|
|
|
|
list or NULL in case of errors.
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
The format fo such a file is line oriented where empty lines and
|
|
|
|
|
lines starting with a hash mark are ignored. All other lines are
|
|
|
|
|
assumed to be colon seprated with these fields:
|
|
|
|
|
|
|
|
|
|
1. field: Hostname
|
|
|
|
|
2. field: Portnumber
|
2011-01-25 11:26:01 +01:00
|
|
|
|
3. field: Username
|
2010-06-09 16:53:51 +00:00
|
|
|
|
4. field: Password
|
|
|
|
|
5. field: Base DN
|
|
|
|
|
|
|
|
|
|
*/
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#if USE_LDAP
|
2010-06-09 16:53:51 +00:00
|
|
|
|
static ldap_server_t
|
|
|
|
|
parse_ldapserver_file (const char* filename)
|
|
|
|
|
{
|
|
|
|
|
char buffer[1024];
|
|
|
|
|
char *p;
|
|
|
|
|
ldap_server_t server, serverstart, *serverend;
|
|
|
|
|
int c;
|
|
|
|
|
unsigned int lineno = 0;
|
2010-07-16 13:19:45 +00:00
|
|
|
|
estream_t fp;
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
2010-07-16 13:19:45 +00:00
|
|
|
|
fp = es_fopen (filename, "r");
|
2010-06-09 16:53:51 +00:00
|
|
|
|
if (!fp)
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error (_("error opening '%s': %s\n"), filename, strerror (errno));
|
2010-06-09 16:53:51 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
serverstart = NULL;
|
|
|
|
|
serverend = &serverstart;
|
2010-07-16 13:19:45 +00:00
|
|
|
|
while (es_fgets (buffer, sizeof buffer, fp))
|
2010-06-09 16:53:51 +00:00
|
|
|
|
{
|
|
|
|
|
lineno++;
|
|
|
|
|
if (!*buffer || buffer[strlen(buffer)-1] != '\n')
|
|
|
|
|
{
|
2010-07-16 13:19:45 +00:00
|
|
|
|
if (*buffer && es_feof (fp))
|
2010-06-09 16:53:51 +00:00
|
|
|
|
; /* Last line not terminated - continue. */
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
log_error (_("%s:%u: line too long - skipped\n"),
|
|
|
|
|
filename, lineno);
|
2010-07-16 13:19:45 +00:00
|
|
|
|
while ( (c=es_fgetc (fp)) != EOF && c != '\n')
|
2010-06-09 16:53:51 +00:00
|
|
|
|
; /* Skip until end of line. */
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* Skip empty and comment lines.*/
|
|
|
|
|
for (p=buffer; spacep (p); p++)
|
|
|
|
|
;
|
|
|
|
|
if (!*p || *p == '\n' || *p == '#')
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* Parse the colon separated fields. */
|
|
|
|
|
server = ldapserver_parse_one (buffer, filename, lineno);
|
|
|
|
|
if (server)
|
|
|
|
|
{
|
|
|
|
|
*serverend = server;
|
|
|
|
|
serverend = &server->next;
|
|
|
|
|
}
|
2011-01-25 11:26:01 +01:00
|
|
|
|
}
|
|
|
|
|
|
2010-07-16 13:19:45 +00:00
|
|
|
|
if (es_ferror (fp))
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error (_("error reading '%s': %s\n"), filename, strerror (errno));
|
2010-07-16 13:19:45 +00:00
|
|
|
|
es_fclose (fp);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
return serverstart;
|
|
|
|
|
}
|
2014-10-17 15:59:45 +02:00
|
|
|
|
#endif /*USE_LDAP*/
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
static fingerprint_list_t
|
|
|
|
|
parse_ocsp_signer (const char *string)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
char *fname;
|
2010-07-16 13:19:45 +00:00
|
|
|
|
estream_t fp;
|
2010-06-09 16:53:51 +00:00
|
|
|
|
char line[256];
|
|
|
|
|
char *p;
|
|
|
|
|
fingerprint_list_t list, *list_tail, item;
|
|
|
|
|
unsigned int lnr = 0;
|
|
|
|
|
int c, i, j;
|
|
|
|
|
int errflag = 0;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Check whether this is not a filename and treat it as a direct
|
|
|
|
|
fingerprint specification. */
|
|
|
|
|
if (!strpbrk (string, "/.~\\"))
|
|
|
|
|
{
|
|
|
|
|
item = xcalloc (1, sizeof *item);
|
|
|
|
|
for (i=j=0; (string[i] == ':' || hexdigitp (string+i)) && j < 40; i++)
|
|
|
|
|
if ( string[i] != ':' )
|
|
|
|
|
item->hexfpr[j++] = string[i] >= 'a'? (string[i] & 0xdf): string[i];
|
|
|
|
|
item->hexfpr[j] = 0;
|
|
|
|
|
if (j != 40 || !(spacep (string+i) || !string[i]))
|
|
|
|
|
{
|
2011-01-25 11:26:01 +01:00
|
|
|
|
log_error (_("%s:%u: invalid fingerprint detected\n"),
|
2010-06-09 16:53:51 +00:00
|
|
|
|
"--ocsp-signer", 0);
|
|
|
|
|
xfree (item);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
return item;
|
|
|
|
|
}
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
/* Well, it is a filename. */
|
|
|
|
|
if (*string == '/' || (*string == '~' && string[1] == '/'))
|
|
|
|
|
fname = make_filename (string, NULL);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (string[0] == '.' && string[1] == '/' )
|
|
|
|
|
string += 2;
|
|
|
|
|
fname = make_filename (opt.homedir, string, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
2010-07-16 13:19:45 +00:00
|
|
|
|
fp = es_fopen (fname, "r");
|
2010-06-09 16:53:51 +00:00
|
|
|
|
if (!fp)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error (_("can't open '%s': %s\n"), fname, gpg_strerror (err));
|
2010-06-09 16:53:51 +00:00
|
|
|
|
xfree (fname);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
list = NULL;
|
|
|
|
|
list_tail = &list;
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
2010-07-16 13:19:45 +00:00
|
|
|
|
if (!es_fgets (line, DIM(line)-1, fp) )
|
2010-06-09 16:53:51 +00:00
|
|
|
|
{
|
2010-07-16 13:19:45 +00:00
|
|
|
|
if (!es_feof (fp))
|
2010-06-09 16:53:51 +00:00
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
log_error (_("%s:%u: read error: %s\n"),
|
|
|
|
|
fname, lnr, gpg_strerror (err));
|
|
|
|
|
errflag = 1;
|
|
|
|
|
}
|
2010-07-16 13:19:45 +00:00
|
|
|
|
es_fclose (fp);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
if (errflag)
|
|
|
|
|
{
|
|
|
|
|
while (list)
|
|
|
|
|
{
|
|
|
|
|
fingerprint_list_t tmp = list->next;
|
|
|
|
|
xfree (list);
|
|
|
|
|
list = tmp;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
xfree (fname);
|
|
|
|
|
return list; /* Ready. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
lnr++;
|
|
|
|
|
if (!*line || line[strlen(line)-1] != '\n')
|
|
|
|
|
{
|
|
|
|
|
/* Eat until end of line. */
|
2010-07-16 13:19:45 +00:00
|
|
|
|
while ( (c=es_getc (fp)) != EOF && c != '\n')
|
2010-06-09 16:53:51 +00:00
|
|
|
|
;
|
|
|
|
|
err = gpg_error (*line? GPG_ERR_LINE_TOO_LONG
|
|
|
|
|
/* */: GPG_ERR_INCOMPLETE_LINE);
|
2011-01-25 11:26:01 +01:00
|
|
|
|
log_error (_("%s:%u: read error: %s\n"),
|
2010-06-09 16:53:51 +00:00
|
|
|
|
fname, lnr, gpg_strerror (err));
|
|
|
|
|
errflag = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Allow for empty lines and spaces */
|
|
|
|
|
for (p=line; spacep (p); p++)
|
|
|
|
|
;
|
|
|
|
|
if (!*p || *p == '\n' || *p == '#')
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
item = xcalloc (1, sizeof *item);
|
|
|
|
|
*list_tail = item;
|
|
|
|
|
list_tail = &item->next;
|
|
|
|
|
|
|
|
|
|
for (i=j=0; (p[i] == ':' || hexdigitp (p+i)) && j < 40; i++)
|
|
|
|
|
if ( p[i] != ':' )
|
|
|
|
|
item->hexfpr[j++] = p[i] >= 'a'? (p[i] & 0xdf): p[i];
|
|
|
|
|
item->hexfpr[j] = 0;
|
|
|
|
|
if (j != 40 || !(spacep (p+i) || p[i] == '\n'))
|
|
|
|
|
{
|
|
|
|
|
log_error (_("%s:%u: invalid fingerprint detected\n"), fname, lnr);
|
|
|
|
|
errflag = 1;
|
|
|
|
|
}
|
|
|
|
|
i++;
|
|
|
|
|
while (spacep (p+i))
|
|
|
|
|
i++;
|
|
|
|
|
if (p[i] && p[i] != '\n')
|
|
|
|
|
log_info (_("%s:%u: garbage at end of line ignored\n"), fname, lnr);
|
|
|
|
|
}
|
|
|
|
|
/*NOTREACHED*/
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2011-01-25 11:26:01 +01:00
|
|
|
|
Stuff used in daemon mode.
|
2010-06-09 16:53:51 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Reread parts of the configuration. Note, that this function is
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
obviously not thread-safe and should only be called from the NPTH
|
2011-01-25 11:26:01 +01:00
|
|
|
|
signal handler.
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
Fixme: Due to the way the argument parsing works, we create a
|
|
|
|
|
memory leak here for all string type arguments. There is currently
|
|
|
|
|
no clean way to tell whether the memory for the argument has been
|
|
|
|
|
allocated or points into the process' original arguments. Unless
|
|
|
|
|
we have a mechanism to tell this, we need to live on with this. */
|
|
|
|
|
static void
|
|
|
|
|
reread_configuration (void)
|
|
|
|
|
{
|
|
|
|
|
ARGPARSE_ARGS pargs;
|
|
|
|
|
FILE *fp;
|
|
|
|
|
unsigned int configlineno = 0;
|
|
|
|
|
int dummy;
|
|
|
|
|
|
|
|
|
|
if (!opt.config_filename)
|
|
|
|
|
return; /* No config file. */
|
|
|
|
|
|
|
|
|
|
fp = fopen (opt.config_filename, "r");
|
|
|
|
|
if (!fp)
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error (_("option file '%s': %s\n"),
|
2010-06-09 16:53:51 +00:00
|
|
|
|
opt.config_filename, strerror(errno) );
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
parse_rereadable_options (NULL, 1); /* Start from the default values. */
|
|
|
|
|
|
|
|
|
|
memset (&pargs, 0, sizeof pargs);
|
|
|
|
|
dummy = 0;
|
|
|
|
|
pargs.argc = &dummy;
|
|
|
|
|
pargs.flags = 1; /* do not remove the args */
|
|
|
|
|
while (optfile_parse (fp, opt.config_filename, &configlineno, &pargs, opts) )
|
|
|
|
|
{
|
|
|
|
|
if (pargs.r_opt < -1)
|
|
|
|
|
pargs.err = 1; /* Print a warning. */
|
|
|
|
|
else /* Try to parse this option - ignore unchangeable ones. */
|
|
|
|
|
parse_rereadable_options (&pargs, 1);
|
|
|
|
|
}
|
|
|
|
|
fclose (fp);
|
|
|
|
|
|
|
|
|
|
set_debug ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-08-12 11:43:46 +00:00
|
|
|
|
/* A global function which allows us to trigger the reload stuff from
|
|
|
|
|
other places. */
|
|
|
|
|
void
|
|
|
|
|
dirmngr_sighup_action (void)
|
|
|
|
|
{
|
|
|
|
|
log_info (_("SIGHUP received - "
|
|
|
|
|
"re-reading configuration and flushing caches\n"));
|
|
|
|
|
reread_configuration ();
|
|
|
|
|
cert_cache_deinit (0);
|
|
|
|
|
crl_cache_deinit ();
|
|
|
|
|
cert_cache_init ();
|
|
|
|
|
crl_cache_init ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
/* The signal handler. */
|
2014-03-07 09:46:44 +01:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
2010-06-09 16:53:51 +00:00
|
|
|
|
static void
|
|
|
|
|
handle_signal (int signo)
|
|
|
|
|
{
|
|
|
|
|
switch (signo)
|
|
|
|
|
{
|
|
|
|
|
case SIGHUP:
|
2010-08-12 11:43:46 +00:00
|
|
|
|
dirmngr_sighup_action ();
|
2010-06-09 16:53:51 +00:00
|
|
|
|
break;
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
case SIGUSR1:
|
|
|
|
|
cert_cache_print_stats ();
|
|
|
|
|
break;
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
case SIGUSR2:
|
|
|
|
|
log_info (_("SIGUSR2 received - no action defined\n"));
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case SIGTERM:
|
|
|
|
|
if (!shutdown_pending)
|
|
|
|
|
log_info (_("SIGTERM received - shutting down ...\n"));
|
|
|
|
|
else
|
|
|
|
|
log_info (_("SIGTERM received - still %d active connections\n"),
|
|
|
|
|
active_connections);
|
|
|
|
|
shutdown_pending++;
|
|
|
|
|
if (shutdown_pending > 2)
|
|
|
|
|
{
|
|
|
|
|
log_info (_("shutdown forced\n"));
|
|
|
|
|
log_info ("%s %s stopped\n", strusage(11), strusage(13) );
|
|
|
|
|
cleanup ();
|
|
|
|
|
dirmngr_exit (0);
|
|
|
|
|
}
|
|
|
|
|
break;
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
case SIGINT:
|
|
|
|
|
log_info (_("SIGINT received - immediate shutdown\n"));
|
|
|
|
|
log_info( "%s %s stopped\n", strusage(11), strusage(13));
|
|
|
|
|
cleanup ();
|
|
|
|
|
dirmngr_exit (0);
|
|
|
|
|
break;
|
2014-03-07 09:46:44 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
default:
|
|
|
|
|
log_info (_("signal %d received - no action defined\n"), signo);
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-03-07 09:46:44 +01:00
|
|
|
|
#endif /*!HAVE_W32_SYSTEM*/
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
|
2014-03-18 11:07:05 +01:00
|
|
|
|
/* Thread to do the housekeeping. */
|
|
|
|
|
static void *
|
|
|
|
|
housekeeping_thread (void *arg)
|
|
|
|
|
{
|
|
|
|
|
static int sentinel;
|
|
|
|
|
time_t curtime;
|
|
|
|
|
|
|
|
|
|
(void)arg;
|
|
|
|
|
|
|
|
|
|
curtime = gnupg_get_time ();
|
|
|
|
|
if (sentinel)
|
|
|
|
|
{
|
|
|
|
|
log_info ("housekeeping is already going on\n");
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
sentinel++;
|
|
|
|
|
if (opt.verbose)
|
|
|
|
|
log_info ("starting housekeeping\n");
|
|
|
|
|
|
|
|
|
|
ks_hkp_housekeeping (curtime);
|
|
|
|
|
|
|
|
|
|
if (opt.verbose)
|
|
|
|
|
log_info ("ready with housekeeping\n");
|
|
|
|
|
sentinel--;
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2014-04-08 17:06:02 +02:00
|
|
|
|
#if JNLIB_GCC_HAVE_PUSH_PRAGMA
|
|
|
|
|
# pragma GCC push_options
|
|
|
|
|
# pragma GCC optimize ("no-strict-overflow")
|
|
|
|
|
#endif
|
|
|
|
|
static int
|
|
|
|
|
time_for_housekeeping_p (time_t curtime)
|
2010-06-09 16:53:51 +00:00
|
|
|
|
{
|
2014-03-18 11:07:05 +01:00
|
|
|
|
static time_t last_housekeeping;
|
|
|
|
|
|
|
|
|
|
if (!last_housekeeping)
|
|
|
|
|
last_housekeeping = curtime;
|
|
|
|
|
|
2014-04-08 17:06:02 +02:00
|
|
|
|
if (last_housekeeping + HOUSEKEEPING_INTERVAL <= curtime
|
|
|
|
|
|| last_housekeeping > curtime /*(be prepared for y2038)*/)
|
|
|
|
|
{
|
|
|
|
|
last_housekeeping = curtime;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#if JNLIB_GCC_HAVE_PUSH_PRAGMA
|
|
|
|
|
# pragma GCC pop_options
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* This is the worker for the ticker. It is called every few seconds
|
|
|
|
|
and may only do fast operations. */
|
|
|
|
|
static void
|
|
|
|
|
handle_tick (void)
|
|
|
|
|
{
|
2014-03-18 11:07:05 +01:00
|
|
|
|
/* Under Windows we don't use signals and need a way for the loop to
|
|
|
|
|
check for the shutdown flag. */
|
2010-06-09 16:53:51 +00:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
if (shutdown_pending)
|
|
|
|
|
log_info (_("SIGTERM received - shutting down ...\n"));
|
|
|
|
|
if (shutdown_pending > 2)
|
|
|
|
|
{
|
|
|
|
|
log_info (_("shutdown forced\n"));
|
|
|
|
|
log_info ("%s %s stopped\n", strusage(11), strusage(13) );
|
|
|
|
|
cleanup ();
|
|
|
|
|
dirmngr_exit (0);
|
|
|
|
|
}
|
|
|
|
|
#endif /*HAVE_W32_SYSTEM*/
|
2014-03-18 11:07:05 +01:00
|
|
|
|
|
2014-04-08 17:06:02 +02:00
|
|
|
|
if (time_for_housekeeping_p (gnupg_get_time ()))
|
2014-03-18 11:07:05 +01:00
|
|
|
|
{
|
|
|
|
|
npth_t thread;
|
|
|
|
|
npth_attr_t tattr;
|
|
|
|
|
int err;
|
|
|
|
|
|
|
|
|
|
err = npth_attr_init (&tattr);
|
|
|
|
|
if (err)
|
|
|
|
|
log_error ("error preparing housekeeping thread: %s\n", strerror (err));
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
npth_attr_setdetachstate (&tattr, NPTH_CREATE_DETACHED);
|
|
|
|
|
err = npth_create (&thread, &tattr, housekeeping_thread, NULL);
|
|
|
|
|
if (err)
|
|
|
|
|
log_error ("error spawning housekeeping thread: %s\n",
|
|
|
|
|
strerror (err));
|
|
|
|
|
npth_attr_destroy (&tattr);
|
|
|
|
|
}
|
|
|
|
|
}
|
2010-06-09 16:53:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Check the nonce on a new connection. This is a NOP unless we we
|
|
|
|
|
are using our Unix domain socket emulation under Windows. */
|
2011-01-25 11:26:01 +01:00
|
|
|
|
static int
|
2010-06-09 16:53:51 +00:00
|
|
|
|
check_nonce (assuan_fd_t fd, assuan_sock_nonce_t *nonce)
|
|
|
|
|
{
|
|
|
|
|
if (assuan_sock_check_nonce (fd, nonce))
|
|
|
|
|
{
|
2011-01-25 11:26:01 +01:00
|
|
|
|
log_info (_("error reading nonce on fd %d: %s\n"),
|
2010-06-09 16:53:51 +00:00
|
|
|
|
FD2INT (fd), strerror (errno));
|
|
|
|
|
assuan_sock_close (fd);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Helper to call a connection's main fucntion. */
|
|
|
|
|
static void *
|
|
|
|
|
start_connection_thread (void *arg)
|
|
|
|
|
{
|
|
|
|
|
union int_and_ptr_u argval;
|
2011-01-25 11:26:01 +01:00
|
|
|
|
gnupg_fd_t fd;
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
argval.aptr = arg;
|
|
|
|
|
fd = argval.afd;
|
|
|
|
|
|
|
|
|
|
if (check_nonce (fd, &socket_nonce))
|
2011-01-25 11:26:01 +01:00
|
|
|
|
{
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
log_error ("handler nonce check FAILED\n");
|
2011-01-25 11:26:01 +01:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_setspecific (my_tlskey_current_fd, argval.aptr);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
active_connections++;
|
|
|
|
|
if (opt.verbose)
|
|
|
|
|
log_info (_("handler for fd %d started\n"), FD2INT (fd));
|
|
|
|
|
|
|
|
|
|
start_command_handler (fd);
|
|
|
|
|
|
|
|
|
|
if (opt.verbose)
|
|
|
|
|
log_info (_("handler for fd %d terminated\n"), FD2INT (fd));
|
|
|
|
|
active_connections--;
|
|
|
|
|
|
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
|
|
|
|
argval.afd = ASSUAN_INVALID_FD;
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_setspecific (my_tlskey_current_fd, argval.aptr);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
#endif
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2010-06-09 16:53:51 +00:00
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Main loop in daemon mode. */
|
|
|
|
|
static void
|
|
|
|
|
handle_connections (assuan_fd_t listen_fd)
|
|
|
|
|
{
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_attr_t tattr;
|
2014-03-07 09:46:44 +01:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
2010-06-09 16:53:51 +00:00
|
|
|
|
int signo;
|
2014-03-07 09:46:44 +01:00
|
|
|
|
#endif
|
2010-06-09 16:53:51 +00:00
|
|
|
|
struct sockaddr_un paddr;
|
|
|
|
|
socklen_t plen = sizeof( paddr );
|
2011-01-25 11:26:01 +01:00
|
|
|
|
gnupg_fd_t fd;
|
|
|
|
|
int nfd, ret;
|
|
|
|
|
fd_set fdset, read_fdset;
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
struct timespec abstime;
|
|
|
|
|
struct timespec curtime;
|
|
|
|
|
struct timespec timeout;
|
|
|
|
|
int saved_errno;
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_attr_init (&tattr);
|
|
|
|
|
npth_attr_setdetachstate (&tattr, NPTH_CREATE_DETACHED);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
|
|
|
|
#ifndef HAVE_W32_SYSTEM /* FIXME */
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_sigev_init ();
|
|
|
|
|
npth_sigev_add (SIGHUP);
|
|
|
|
|
npth_sigev_add (SIGUSR1);
|
|
|
|
|
npth_sigev_add (SIGUSR2);
|
|
|
|
|
npth_sigev_add (SIGINT);
|
|
|
|
|
npth_sigev_add (SIGTERM);
|
|
|
|
|
npth_sigev_fini ();
|
2010-06-09 16:53:51 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
2011-01-25 11:26:01 +01:00
|
|
|
|
/* Setup the fdset. It has only one member. This is because we use
|
|
|
|
|
pth_select instead of pth_accept to properly sync timeouts with
|
|
|
|
|
to full second. */
|
|
|
|
|
FD_ZERO (&fdset);
|
|
|
|
|
FD_SET (FD2INT (listen_fd), &fdset);
|
|
|
|
|
nfd = FD2INT (listen_fd);
|
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_clock_gettime (&abstime);
|
|
|
|
|
abstime.tv_sec += TIMERTICK_INTERVAL;
|
|
|
|
|
|
2011-01-25 11:26:01 +01:00
|
|
|
|
/* Main loop. */
|
2010-06-09 16:53:51 +00:00
|
|
|
|
for (;;)
|
|
|
|
|
{
|
2011-01-25 11:26:01 +01:00
|
|
|
|
/* Shutdown test. */
|
2010-06-09 16:53:51 +00:00
|
|
|
|
if (shutdown_pending)
|
|
|
|
|
{
|
|
|
|
|
if (!active_connections)
|
|
|
|
|
break; /* ready */
|
|
|
|
|
|
2011-01-25 11:26:01 +01:00
|
|
|
|
/* Do not accept new connections but keep on running the
|
|
|
|
|
loop to cope with the timer events. */
|
|
|
|
|
FD_ZERO (&fdset);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
}
|
|
|
|
|
|
2011-01-25 11:26:01 +01:00
|
|
|
|
/* Take a copy of the fdset. */
|
|
|
|
|
read_fdset = fdset;
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_clock_gettime (&curtime);
|
|
|
|
|
if (!(npth_timercmp (&curtime, &abstime, <)))
|
|
|
|
|
{
|
|
|
|
|
/* Timeout. */
|
|
|
|
|
handle_tick ();
|
|
|
|
|
npth_clock_gettime (&abstime);
|
|
|
|
|
abstime.tv_sec += TIMERTICK_INTERVAL;
|
|
|
|
|
}
|
|
|
|
|
npth_timersub (&abstime, &curtime, &timeout);
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
2012-01-19 22:27:44 +01:00
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
ret = npth_pselect (nfd+1, &read_fdset, NULL, NULL, &timeout, npth_sigev_sigmask());
|
|
|
|
|
saved_errno = errno;
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
while (npth_sigev_get_pending(&signo))
|
|
|
|
|
handle_signal (signo);
|
2012-01-19 22:27:44 +01:00
|
|
|
|
#else
|
|
|
|
|
ret = npth_eselect (nfd+1, &read_fdset, NULL, NULL, &timeout, NULL, NULL);
|
|
|
|
|
saved_errno = errno;
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
#endif
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
if (ret == -1 && saved_errno != EINTR)
|
|
|
|
|
{
|
|
|
|
|
log_error (_("npth_pselect failed: %s - waiting 1s\n"),
|
|
|
|
|
strerror (saved_errno));
|
|
|
|
|
npth_sleep (1);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
if (ret <= 0)
|
|
|
|
|
/* Interrupt or timeout. Will be handled when calculating the
|
|
|
|
|
next timeout. */
|
|
|
|
|
continue;
|
2010-06-09 16:53:51 +00:00
|
|
|
|
|
2011-01-25 11:26:01 +01:00
|
|
|
|
if (!shutdown_pending && FD_ISSET (FD2INT (listen_fd), &read_fdset))
|
|
|
|
|
{
|
|
|
|
|
plen = sizeof paddr;
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
fd = INT2FD (npth_accept (FD2INT(listen_fd),
|
|
|
|
|
(struct sockaddr *)&paddr, &plen));
|
2011-01-25 11:26:01 +01:00
|
|
|
|
if (fd == GNUPG_INVALID_FD)
|
|
|
|
|
{
|
|
|
|
|
log_error ("accept failed: %s\n", strerror (errno));
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
char threadname[50];
|
|
|
|
|
union int_and_ptr_u argval;
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_t thread;
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
|
|
|
|
argval.afd = fd;
|
|
|
|
|
snprintf (threadname, sizeof threadname-1,
|
|
|
|
|
"conn fd=%d", FD2INT(fd));
|
|
|
|
|
threadname[sizeof threadname -1] = 0;
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
|
|
|
|
|
ret = npth_create (&thread, &tattr, start_connection_thread, argval.aptr);
|
|
|
|
|
if (ret)
|
2011-01-25 11:26:01 +01:00
|
|
|
|
{
|
|
|
|
|
log_error ("error spawning connection handler: %s\n",
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
strerror (ret) );
|
2011-01-25 11:26:01 +01:00
|
|
|
|
assuan_sock_close (fd);
|
|
|
|
|
}
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_setname_np (thread, threadname);
|
2011-01-25 11:26:01 +01:00
|
|
|
|
}
|
|
|
|
|
fd = GNUPG_INVALID_FD;
|
|
|
|
|
}
|
2010-06-09 16:53:51 +00:00
|
|
|
|
}
|
2011-01-25 11:26:01 +01:00
|
|
|
|
|
Port to npth.
* configure.ac: Don't check for PTH but for NPTH.
(AH_BOTTOM): Remove PTH_SYSCALL_SOFT.
(have_pth): Rename to ...
(have_npth): ... this.
(USE_GNU_NPTH): Rename to ...
(USE_GNU_PTH): ... this.
* m4/npth.m4: New file.
* agent/Makefile.am, agent/cache.c, agent/call-pinentry.c,
agent/call-scd.c, agent/findkey.c, agent/gpg-agent.c,
agent/trustlist.c, common/Makefile.am, common/estream.c,
common/exechelp-posix.c, common/exechelp-w32.c,
common/exechelp-w32ce.c, common/http.c, common/init.c,
common/sysutils.c, dirmngr/Makefile.am, dirmngr/crlfetch.c,
dirmngr/dirmngr.c, dirmngr/dirmngr_ldap.c, dirmngr/ldap-wrapper-ce.c,
dirmngr/ldap-wrapper.c, dirmngr/ldap.c, g13/Makefile.am,
g13/call-gpg.c, g13/g13.c, g13/runner.c, scd/Makefile.am,
scd/apdu.c, scd/app.c, scd/ccid-driver.c, scd/command.c,
scd/scdaemon.c, tools/Makefile.am: Port to npth.
2012-01-03 22:12:37 +01:00
|
|
|
|
npth_attr_destroy (&tattr);
|
2010-06-09 16:53:51 +00:00
|
|
|
|
cleanup ();
|
|
|
|
|
log_info ("%s %s stopped\n", strusage(11), strusage(13));
|
|
|
|
|
}
|