2009-09-23 10:28:41 +00:00
|
|
|
|
/* g13.c - Disk Key management with GnuPG
|
|
|
|
|
* Copyright (C) 2009 Free Software Foundation, Inc.
|
|
|
|
|
*
|
|
|
|
|
* This file is part of GnuPG.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation; either version 3 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* GnuPG is distributed in the hope that it will be useful,
|
|
|
|
|
* 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
|
|
|
|
|
* along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#include <fcntl.h>
|
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>
|
2009-09-23 10:28:41 +00:00
|
|
|
|
|
|
|
|
|
#include "g13.h"
|
|
|
|
|
|
|
|
|
|
#include <gcrypt.h>
|
2009-09-30 15:28:38 +00:00
|
|
|
|
#include <assuan.h>
|
2009-09-23 10:28:41 +00:00
|
|
|
|
|
|
|
|
|
#include "i18n.h"
|
|
|
|
|
#include "sysutils.h"
|
|
|
|
|
#include "gc-opt-flags.h"
|
2010-03-11 12:34:11 +00:00
|
|
|
|
#include "asshelp.h"
|
2012-02-06 20:50:47 +01:00
|
|
|
|
#include "../common/init.h"
|
2009-09-30 15:28:38 +00:00
|
|
|
|
#include "keyblob.h"
|
2009-10-14 17:06:10 +00:00
|
|
|
|
#include "server.h"
|
|
|
|
|
#include "runner.h"
|
|
|
|
|
#include "create.h"
|
2009-10-15 17:20:41 +00:00
|
|
|
|
#include "mount.h"
|
|
|
|
|
#include "mountinfo.h"
|
2009-09-23 10:28:41 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
enum cmd_and_opt_values {
|
|
|
|
|
aNull = 0,
|
|
|
|
|
oQuiet = 'q',
|
|
|
|
|
oVerbose = 'v',
|
2009-10-19 09:18:46 +00:00
|
|
|
|
oRecipient = 'r',
|
2009-09-23 10:28:41 +00:00
|
|
|
|
|
|
|
|
|
aGPGConfList = 500,
|
|
|
|
|
aGPGConfTest,
|
|
|
|
|
aCreate,
|
|
|
|
|
aMount,
|
|
|
|
|
aUmount,
|
2009-10-14 17:06:10 +00:00
|
|
|
|
aServer,
|
2009-09-23 10:28:41 +00:00
|
|
|
|
|
|
|
|
|
oOptions,
|
|
|
|
|
oDebug,
|
|
|
|
|
oDebugLevel,
|
|
|
|
|
oDebugAll,
|
|
|
|
|
oDebugNone,
|
|
|
|
|
oDebugWait,
|
|
|
|
|
oDebugAllowCoreDump,
|
|
|
|
|
oLogFile,
|
|
|
|
|
oNoLogFile,
|
|
|
|
|
oAuditLog,
|
|
|
|
|
|
|
|
|
|
oOutput,
|
|
|
|
|
|
|
|
|
|
oAgentProgram,
|
2009-09-30 15:28:38 +00:00
|
|
|
|
oGpgProgram,
|
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
oDisplay,
|
|
|
|
|
oTTYname,
|
|
|
|
|
oTTYtype,
|
|
|
|
|
oLCctype,
|
|
|
|
|
oLCmessages,
|
|
|
|
|
oXauthority,
|
|
|
|
|
|
|
|
|
|
oStatusFD,
|
|
|
|
|
oLoggerFD,
|
|
|
|
|
|
|
|
|
|
oNoVerbose,
|
|
|
|
|
oNoSecmemWarn,
|
|
|
|
|
oNoGreeting,
|
|
|
|
|
oNoTTY,
|
|
|
|
|
oNoOptions,
|
|
|
|
|
oHomedir,
|
|
|
|
|
oWithColons,
|
|
|
|
|
oDryRun,
|
2009-10-13 19:17:24 +00:00
|
|
|
|
oNoDetach,
|
2009-09-23 10:28:41 +00:00
|
|
|
|
|
|
|
|
|
oNoRandomSeedFile,
|
|
|
|
|
oFakedSystemTime
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static ARGPARSE_OPTS opts[] = {
|
|
|
|
|
|
|
|
|
|
ARGPARSE_group (300, N_("@Commands:\n ")),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_c (aCreate, "create", N_("Create a new file system container")),
|
|
|
|
|
ARGPARSE_c (aMount, "mount", N_("Mount a file system container") ),
|
|
|
|
|
ARGPARSE_c (aUmount, "umount", N_("Unmount a file system container") ),
|
2009-10-14 17:06:10 +00:00
|
|
|
|
ARGPARSE_c (aServer, "server", N_("Run in server mode")),
|
2009-09-23 10:28:41 +00:00
|
|
|
|
|
|
|
|
|
ARGPARSE_c (aGPGConfList, "gpgconf-list", "@"),
|
|
|
|
|
ARGPARSE_c (aGPGConfTest, "gpgconf-test", "@"),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_group (301, N_("@\nOptions:\n ")),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_s_s (oRecipient, "recipient", N_("|USER-ID|encrypt for USER-ID")),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_s_s (oOutput, "output", N_("|FILE|write output to FILE")),
|
|
|
|
|
ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")),
|
|
|
|
|
ARGPARSE_s_n (oQuiet, "quiet", N_("be somewhat more quiet")),
|
|
|
|
|
ARGPARSE_s_n (oNoTTY, "no-tty", N_("don't use the terminal at all")),
|
2009-10-13 19:17:24 +00:00
|
|
|
|
ARGPARSE_s_n (oNoDetach, "no-detach", N_("do not detach from the console")),
|
2009-09-23 10:28:41 +00:00
|
|
|
|
ARGPARSE_s_s (oLogFile, "log-file", N_("|FILE|write log output to FILE")),
|
|
|
|
|
ARGPARSE_s_n (oNoLogFile, "no-log-file", "@"),
|
|
|
|
|
ARGPARSE_s_i (oLoggerFD, "logger-fd", "@"),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_s_n (oDryRun, "dry-run", N_("do not make any changes")),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_s_s (oOptions, "options", N_("|FILE|read options from FILE")),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_p_u (oDebug, "debug", "@"),
|
|
|
|
|
ARGPARSE_s_s (oDebugLevel, "debug-level",
|
|
|
|
|
N_("|LEVEL|set the debugging level to LEVEL")),
|
|
|
|
|
ARGPARSE_s_n (oDebugAll, "debug-all", "@"),
|
|
|
|
|
ARGPARSE_s_n (oDebugNone, "debug-none", "@"),
|
|
|
|
|
ARGPARSE_s_i (oDebugWait, "debug-wait", "@"),
|
|
|
|
|
ARGPARSE_s_n (oDebugAllowCoreDump, "debug-allow-core-dump", "@"),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_s_i (oStatusFD, "status-fd",
|
|
|
|
|
N_("|FD|write status info to this FD")),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_group (302, N_(
|
|
|
|
|
"@\n(See the man page for a complete listing of all commands and options)\n"
|
|
|
|
|
)),
|
|
|
|
|
|
|
|
|
|
ARGPARSE_group (303, N_("@\nExamples:\n\n"
|
|
|
|
|
" blurb\n"
|
|
|
|
|
" blurb\n")),
|
|
|
|
|
|
|
|
|
|
/* Hidden options. */
|
|
|
|
|
ARGPARSE_s_n (oNoVerbose, "no-verbose", "@"),
|
2011-02-04 12:57:53 +01:00
|
|
|
|
ARGPARSE_s_n (oNoSecmemWarn, "no-secmem-warning", "@"),
|
2009-09-23 10:28:41 +00:00
|
|
|
|
ARGPARSE_s_n (oNoGreeting, "no-greeting", "@"),
|
|
|
|
|
ARGPARSE_s_n (oNoOptions, "no-options", "@"),
|
2011-02-04 12:57:53 +01:00
|
|
|
|
ARGPARSE_s_s (oHomedir, "homedir", "@"),
|
2009-09-23 10:28:41 +00:00
|
|
|
|
ARGPARSE_s_s (oAgentProgram, "agent-program", "@"),
|
2009-09-30 15:28:38 +00:00
|
|
|
|
ARGPARSE_s_s (oGpgProgram, "gpg-program", "@"),
|
2009-09-23 10:28:41 +00:00
|
|
|
|
ARGPARSE_s_s (oDisplay, "display", "@"),
|
|
|
|
|
ARGPARSE_s_s (oTTYname, "ttyname", "@"),
|
|
|
|
|
ARGPARSE_s_s (oTTYtype, "ttytype", "@"),
|
|
|
|
|
ARGPARSE_s_s (oLCctype, "lc-ctype", "@"),
|
|
|
|
|
ARGPARSE_s_s (oLCmessages, "lc-messages", "@"),
|
|
|
|
|
ARGPARSE_s_s (oXauthority, "xauthority", "@"),
|
|
|
|
|
ARGPARSE_s_s (oFakedSystemTime, "faked-system-time", "@"),
|
|
|
|
|
ARGPARSE_s_n (oWithColons, "with-colons", "@"),
|
|
|
|
|
ARGPARSE_s_n (oNoRandomSeedFile, "no-random-seed-file", "@"),
|
|
|
|
|
|
|
|
|
|
/* Command aliases. */
|
|
|
|
|
|
|
|
|
|
ARGPARSE_end ()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2009-10-14 17:06:10 +00:00
|
|
|
|
/* The timer tick interval used by the idle task. */
|
|
|
|
|
#define TIMERTICK_INTERVAL_SEC (1)
|
|
|
|
|
|
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
/* Global variable to keep an error count. */
|
|
|
|
|
int g13_errors_seen = 0;
|
|
|
|
|
|
|
|
|
|
/* It is possible that we are currently running under setuid permissions. */
|
|
|
|
|
static int maybe_setuid = 1;
|
|
|
|
|
|
|
|
|
|
/* Helper to implement --debug-level and --debug. */
|
|
|
|
|
static const char *debug_level;
|
|
|
|
|
static unsigned int debug_value;
|
|
|
|
|
|
2009-10-14 17:06:10 +00:00
|
|
|
|
/* Flag to indicate that a shutdown was requested. */
|
|
|
|
|
static int shutdown_pending;
|
|
|
|
|
|
|
|
|
|
/* The thread id of the idle task. */
|
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
|
|
|
|
static npth_t idle_task_thread;
|
2009-10-14 17:06:10 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
static void set_cmd (enum cmd_and_opt_values *ret_cmd,
|
|
|
|
|
enum cmd_and_opt_values new_cmd );
|
|
|
|
|
|
|
|
|
|
static void emergency_cleanup (void);
|
2009-10-14 17:06:10 +00:00
|
|
|
|
static void start_idle_task (void);
|
|
|
|
|
static void join_idle_task (void);
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
/* Begin NPth wrapper functions. */
|
|
|
|
|
ASSUAN_SYSTEM_NPTH_IMPL;
|
2009-09-23 10:28:41 +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
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
static const char *
|
|
|
|
|
my_strusage( int level )
|
|
|
|
|
{
|
|
|
|
|
const char *p;
|
|
|
|
|
|
|
|
|
|
switch (level)
|
|
|
|
|
{
|
|
|
|
|
case 11: p = "g13 (GnuPG)";
|
|
|
|
|
break;
|
|
|
|
|
case 13: p = VERSION; break;
|
|
|
|
|
case 17: p = PRINTABLE_OS_NAME; break;
|
|
|
|
|
case 19: p = _("Please report bugs to <" PACKAGE_BUGREPORT ">.\n");
|
|
|
|
|
break;
|
|
|
|
|
case 1:
|
|
|
|
|
case 40: p = _("Usage: g13 [options] [files] (-h for help)");
|
|
|
|
|
break;
|
|
|
|
|
case 41:
|
|
|
|
|
p = _("Syntax: g13 [options] [files]\n"
|
|
|
|
|
"Create, mount or unmount an encrypted file system container\n");
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 31: p = "\nHome: "; break;
|
|
|
|
|
case 32: p = opt.homedir; break;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
default: p = NULL; break;
|
|
|
|
|
}
|
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
wrong_args (const char *text)
|
|
|
|
|
{
|
|
|
|
|
fputs (_("usage: g13 [options] "), stderr);
|
|
|
|
|
fputs (text, stderr);
|
|
|
|
|
putc ('\n', stderr);
|
|
|
|
|
g13_exit (2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Setup the debugging. With a DEBUG_LEVEL of NULL only the active
|
|
|
|
|
debug flags are propagated to the subsystems. With DEBUG_LEVEL
|
|
|
|
|
set, a specific set of debug flags is set; and individual debugging
|
|
|
|
|
flags will be added on top. */
|
|
|
|
|
static void
|
|
|
|
|
set_debug (void)
|
|
|
|
|
{
|
2009-12-03 18:04:40 +00:00
|
|
|
|
int numok = (debug_level && digitp (debug_level));
|
|
|
|
|
int numlvl = numok? atoi (debug_level) : 0;
|
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
if (!debug_level)
|
|
|
|
|
;
|
2009-12-03 18:04:40 +00:00
|
|
|
|
else if (!strcmp (debug_level, "none") || (numok && numlvl < 1))
|
2009-09-23 10:28:41 +00:00
|
|
|
|
opt.debug = 0;
|
2009-12-03 18:04:40 +00:00
|
|
|
|
else if (!strcmp (debug_level, "basic") || (numok && numlvl <= 2))
|
2009-09-23 10:28:41 +00:00
|
|
|
|
opt.debug = DBG_ASSUAN_VALUE|DBG_MOUNT_VALUE;
|
2009-12-03 18:04:40 +00:00
|
|
|
|
else if (!strcmp (debug_level, "advanced") || (numok && numlvl <= 5))
|
2009-09-23 10:28:41 +00:00
|
|
|
|
opt.debug = DBG_ASSUAN_VALUE|DBG_MOUNT_VALUE;
|
2009-12-03 18:04:40 +00:00
|
|
|
|
else if (!strcmp (debug_level, "expert") || (numok && numlvl <= 8))
|
2009-09-23 10:28:41 +00:00
|
|
|
|
opt.debug = (DBG_ASSUAN_VALUE|DBG_MOUNT_VALUE|DBG_CRYPTO_VALUE);
|
2009-12-03 18:04:40 +00:00
|
|
|
|
else if (!strcmp (debug_level, "guru") || numok)
|
|
|
|
|
{
|
|
|
|
|
opt.debug = ~0;
|
|
|
|
|
/* if (numok) */
|
|
|
|
|
/* opt.debug &= ~(DBG_HASHING_VALUE); */
|
|
|
|
|
}
|
2009-09-23 10:28:41 +00:00
|
|
|
|
else
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error (_("invalid debug-level '%s' given\n"), debug_level);
|
2009-09-23 10:28:41 +00:00
|
|
|
|
g13_exit(2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
opt.debug |= debug_value;
|
|
|
|
|
|
|
|
|
|
if (opt.debug && !opt.verbose)
|
|
|
|
|
opt.verbose = 1;
|
|
|
|
|
if (opt.debug)
|
|
|
|
|
opt.quiet = 0;
|
|
|
|
|
|
|
|
|
|
if (opt.debug & DBG_CRYPTO_VALUE )
|
|
|
|
|
gcry_control (GCRYCTL_SET_DEBUG_FLAGS, 1);
|
|
|
|
|
gcry_control (GCRYCTL_SET_VERBOSITY, (int)opt.verbose);
|
2009-12-03 18:04:40 +00:00
|
|
|
|
|
|
|
|
|
if (opt.debug)
|
|
|
|
|
log_info ("enabled debug flags:%s%s%s%s%s\n",
|
2011-02-04 12:57:53 +01:00
|
|
|
|
(opt.debug & DBG_MOUNT_VALUE )? " mount":"",
|
|
|
|
|
(opt.debug & DBG_CRYPTO_VALUE )? " crypto":"",
|
|
|
|
|
(opt.debug & DBG_MEMORY_VALUE )? " memory":"",
|
|
|
|
|
(opt.debug & DBG_MEMSTAT_VALUE)? " memstat":"",
|
2009-12-03 18:04:40 +00:00
|
|
|
|
(opt.debug & DBG_ASSUAN_VALUE )? " assuan":"");
|
2009-09-23 10:28:41 +00:00
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
set_cmd (enum cmd_and_opt_values *ret_cmd, enum cmd_and_opt_values new_cmd)
|
|
|
|
|
{
|
|
|
|
|
enum cmd_and_opt_values cmd = *ret_cmd;
|
|
|
|
|
|
|
|
|
|
if (!cmd || cmd == new_cmd)
|
|
|
|
|
cmd = new_cmd;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
else
|
2009-09-23 10:28:41 +00:00
|
|
|
|
{
|
|
|
|
|
log_error (_("conflicting commands\n"));
|
|
|
|
|
g13_exit (2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*ret_cmd = cmd;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
main ( int argc, char **argv)
|
|
|
|
|
{
|
|
|
|
|
ARGPARSE_ARGS pargs;
|
|
|
|
|
int orig_argc;
|
|
|
|
|
char **orig_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
|
|
|
|
gpg_error_t err = 0;
|
2009-09-23 10:28:41 +00:00
|
|
|
|
const char *fname;
|
|
|
|
|
int may_coredump;
|
|
|
|
|
FILE *configfp = NULL;
|
|
|
|
|
char *configname = NULL;
|
|
|
|
|
unsigned configlineno;
|
|
|
|
|
int parse_debug = 0;
|
|
|
|
|
int no_more_options = 0;
|
|
|
|
|
int default_config =1;
|
|
|
|
|
char *logfile = NULL;
|
|
|
|
|
int greeting = 0;
|
|
|
|
|
int nogreeting = 0;
|
|
|
|
|
int debug_wait = 0;
|
|
|
|
|
int use_random_seed = 1;
|
2009-10-13 19:17:24 +00:00
|
|
|
|
int nodetach = 0;
|
2009-09-23 10:28:41 +00:00
|
|
|
|
int nokeysetup = 0;
|
|
|
|
|
enum cmd_and_opt_values cmd = 0;
|
|
|
|
|
struct server_control_s ctrl;
|
|
|
|
|
strlist_t recipients = NULL;
|
|
|
|
|
|
|
|
|
|
/*mtrace();*/
|
|
|
|
|
|
|
|
|
|
gnupg_reopen_std ("g13");
|
|
|
|
|
set_strusage (my_strusage);
|
|
|
|
|
gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
|
|
|
|
|
|
|
|
|
|
log_set_prefix ("g13", 1);
|
|
|
|
|
|
|
|
|
|
/* Make sure that our subsystems are ready. */
|
2009-09-30 15:28:38 +00:00
|
|
|
|
i18n_init ();
|
2010-03-22 12:46:05 +00:00
|
|
|
|
init_common_subsystems (&argc, &argv);
|
2009-09-23 10:28:41 +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_init ();
|
2009-09-30 15:28:38 +00:00
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
/* Check that the Libgcrypt is suitable. */
|
|
|
|
|
if (!gcry_check_version (NEED_LIBGCRYPT_VERSION) )
|
2011-02-04 12:57:53 +01:00
|
|
|
|
log_fatal (_("%s is too old (need %s, have %s)\n"), "libgcrypt",
|
2009-09-23 10:28:41 +00:00
|
|
|
|
NEED_LIBGCRYPT_VERSION, gcry_check_version (NULL) );
|
|
|
|
|
|
|
|
|
|
/* Take extra care of the random pool. */
|
|
|
|
|
gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);
|
|
|
|
|
|
|
|
|
|
may_coredump = disable_core_dumps ();
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
gnupg_init_signals (0, emergency_cleanup);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2011-09-28 15:41:58 +02:00
|
|
|
|
dotlock_create (NULL, 0); /* Register locking cleanup. */
|
2009-09-23 10:28:41 +00:00
|
|
|
|
|
2009-11-05 02:18:31 +00:00
|
|
|
|
opt.session_env = session_env_new ();
|
|
|
|
|
if (!opt.session_env)
|
|
|
|
|
log_fatal ("error allocating session environment block: %s\n",
|
|
|
|
|
strerror (errno));
|
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
opt.homedir = default_homedir ();
|
|
|
|
|
|
|
|
|
|
/* First check whether we have a config file 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 config 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;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Initialize the secure memory. */
|
|
|
|
|
gcry_control (GCRYCTL_INIT_SECMEM, 16384, 0);
|
|
|
|
|
maybe_setuid = 0;
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
/*
|
|
|
|
|
Now we are now working under our real uid
|
2009-09-23 10:28:41 +00:00
|
|
|
|
*/
|
|
|
|
|
|
2009-09-30 15:28:38 +00:00
|
|
|
|
/* Setup malloc hooks. */
|
|
|
|
|
{
|
|
|
|
|
struct assuan_malloc_hooks malloc_hooks;
|
|
|
|
|
|
|
|
|
|
malloc_hooks.malloc = gcry_malloc;
|
|
|
|
|
malloc_hooks.realloc = gcry_realloc;
|
|
|
|
|
malloc_hooks.free = gcry_free;
|
|
|
|
|
assuan_set_malloc_hooks (&malloc_hooks);
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-09-30 15:28:38 +00:00
|
|
|
|
/* Prepare libassuan. */
|
|
|
|
|
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-03-11 12:34:11 +00:00
|
|
|
|
setup_libassuan_logging (&opt.debug);
|
2009-09-23 10:28:41 +00:00
|
|
|
|
|
|
|
|
|
/* Setup a default control structure for command line mode. */
|
|
|
|
|
memset (&ctrl, 0, sizeof ctrl);
|
|
|
|
|
g13_init_default_ctrl (&ctrl);
|
2009-10-28 12:02:15 +00:00
|
|
|
|
ctrl.no_server = 1;
|
|
|
|
|
ctrl.status_fd = -1; /* No status output. */
|
2009-09-23 10:28:41 +00:00
|
|
|
|
|
|
|
|
|
/* Set the default option file */
|
|
|
|
|
if (default_config )
|
|
|
|
|
configname = make_filename (opt.homedir, "g13.conf", NULL);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
argc = orig_argc;
|
|
|
|
|
argv = orig_argv;
|
|
|
|
|
pargs.argc = &argc;
|
|
|
|
|
pargs.argv = &argv;
|
|
|
|
|
pargs.flags = 1; /* Do not remove the args. */
|
|
|
|
|
|
|
|
|
|
next_pass:
|
2009-09-30 15:28:38 +00:00
|
|
|
|
if (configname)
|
|
|
|
|
{
|
|
|
|
|
configlineno = 0;
|
|
|
|
|
configfp = fopen (configname, "r");
|
|
|
|
|
if (!configfp)
|
|
|
|
|
{
|
|
|
|
|
if (default_config)
|
|
|
|
|
{
|
|
|
|
|
if (parse_debug)
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_info (_("NOTE: no default option file '%s'\n"), configname);
|
2009-09-30 15:28:38 +00:00
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
else
|
2009-09-30 15:28:38 +00:00
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error (_("option file '%s': %s\n"),
|
2009-09-30 15:28:38 +00:00
|
|
|
|
configname, strerror(errno));
|
|
|
|
|
g13_exit(2);
|
|
|
|
|
}
|
|
|
|
|
xfree (configname);
|
|
|
|
|
configname = NULL;
|
|
|
|
|
}
|
|
|
|
|
if (parse_debug && configname)
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_info (_("reading options from '%s'\n"), configname);
|
2009-09-30 15:28:38 +00:00
|
|
|
|
default_config = 0;
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
|
|
|
|
while (!no_more_options
|
2009-09-23 10:28:41 +00:00
|
|
|
|
&& optfile_parse (configfp, configname, &configlineno, &pargs, opts))
|
|
|
|
|
{
|
|
|
|
|
switch (pargs.r_opt)
|
|
|
|
|
{
|
2011-02-04 12:57:53 +01:00
|
|
|
|
case aGPGConfList:
|
|
|
|
|
case aGPGConfTest:
|
2009-09-23 10:28:41 +00:00
|
|
|
|
set_cmd (&cmd, pargs.r_opt);
|
|
|
|
|
nogreeting = 1;
|
|
|
|
|
nokeysetup = 1;
|
|
|
|
|
break;
|
|
|
|
|
|
2009-10-14 17:06:10 +00:00
|
|
|
|
case aServer:
|
2009-09-23 10:28:41 +00:00
|
|
|
|
case aMount:
|
|
|
|
|
case aUmount:
|
|
|
|
|
nokeysetup = 1;
|
|
|
|
|
case aCreate:
|
|
|
|
|
set_cmd (&cmd, pargs.r_opt);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case oOutput: opt.outfile = pargs.r.ret_str; break;
|
|
|
|
|
|
|
|
|
|
case oQuiet: opt.quiet = 1; break;
|
|
|
|
|
case oNoGreeting: nogreeting = 1; break;
|
|
|
|
|
case oNoTTY: break;
|
|
|
|
|
|
|
|
|
|
case oDryRun: opt.dry_run = 1; break;
|
|
|
|
|
|
|
|
|
|
case oVerbose:
|
|
|
|
|
opt.verbose++;
|
|
|
|
|
gcry_control (GCRYCTL_SET_VERBOSITY, (int)opt.verbose);
|
|
|
|
|
break;
|
|
|
|
|
case oNoVerbose:
|
|
|
|
|
opt.verbose = 0;
|
|
|
|
|
gcry_control (GCRYCTL_SET_VERBOSITY, (int)opt.verbose);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case oLogFile: logfile = pargs.r.ret_str; break;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
case oNoLogFile: logfile = NULL; break;
|
2009-09-23 10:28:41 +00:00
|
|
|
|
|
2009-10-13 19:17:24 +00:00
|
|
|
|
case oNoDetach: nodetach = 1; break;
|
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
case oDebug: debug_value |= pargs.r.ret_ulong; break;
|
|
|
|
|
case oDebugAll: debug_value = ~0; break;
|
|
|
|
|
case oDebugNone: debug_value = 0; break;
|
|
|
|
|
case oDebugLevel: debug_level = pargs.r.ret_str; break;
|
|
|
|
|
case oDebugWait: debug_wait = pargs.r.ret_int; break;
|
|
|
|
|
case oDebugAllowCoreDump:
|
|
|
|
|
may_coredump = enable_core_dumps ();
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case oStatusFD: ctrl.status_fd = pargs.r.ret_int; break;
|
|
|
|
|
case oLoggerFD: log_set_fd (pargs.r.ret_int ); break;
|
|
|
|
|
|
|
|
|
|
case oNoOptions: break; /* no-options */
|
|
|
|
|
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 oHomedir: opt.homedir = pargs.r.ret_str; break;
|
|
|
|
|
|
|
|
|
|
case oAgentProgram: opt.agent_program = pargs.r.ret_str; break;
|
2009-09-30 15:28:38 +00:00
|
|
|
|
case oGpgProgram: opt.gpg_program = pargs.r.ret_str; break;
|
2009-09-23 10:28:41 +00:00
|
|
|
|
case oDisplay: opt.display = xstrdup (pargs.r.ret_str); break;
|
|
|
|
|
case oTTYname: opt.ttyname = xstrdup (pargs.r.ret_str); break;
|
|
|
|
|
case oTTYtype: opt.ttytype = xstrdup (pargs.r.ret_str); break;
|
|
|
|
|
case oLCctype: opt.lc_ctype = xstrdup (pargs.r.ret_str); break;
|
|
|
|
|
case oLCmessages: opt.lc_messages = xstrdup (pargs.r.ret_str); break;
|
|
|
|
|
case oXauthority: opt.xauthority = xstrdup (pargs.r.ret_str); break;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
case oFakedSystemTime:
|
|
|
|
|
{
|
2011-02-04 12:57:53 +01:00
|
|
|
|
time_t faked_time = isotime2epoch (pargs.r.ret_str);
|
2009-09-23 10:28:41 +00:00
|
|
|
|
if (faked_time == (time_t)(-1))
|
|
|
|
|
faked_time = (time_t)strtoul (pargs.r.ret_str, NULL, 10);
|
|
|
|
|
gnupg_set_time (faked_time, 0);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case oNoSecmemWarn: gcry_control (GCRYCTL_DISABLE_SECMEM_WARN); break;
|
|
|
|
|
|
|
|
|
|
case oNoRandomSeedFile: use_random_seed = 0; break;
|
|
|
|
|
|
|
|
|
|
case oRecipient: /* Store the encryption key. */
|
|
|
|
|
add_to_strlist (&recipients, pargs.r.ret_str);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
2011-02-04 12:57:53 +01:00
|
|
|
|
default:
|
|
|
|
|
pargs.err = configfp? ARGPARSE_PRINT_WARNING:ARGPARSE_PRINT_ERROR;
|
2009-09-23 10:28:41 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (configfp)
|
|
|
|
|
{
|
|
|
|
|
fclose (configfp);
|
|
|
|
|
configfp = NULL;
|
|
|
|
|
/* Keep a copy of the config filename. */
|
|
|
|
|
opt.config_filename = configname;
|
|
|
|
|
configname = NULL;
|
|
|
|
|
goto next_pass;
|
|
|
|
|
}
|
|
|
|
|
xfree (configname);
|
|
|
|
|
configname = NULL;
|
|
|
|
|
|
|
|
|
|
if (!opt.config_filename)
|
|
|
|
|
opt.config_filename = make_filename (opt.homedir, "g13.conf", NULL);
|
|
|
|
|
|
|
|
|
|
if (log_get_errorcount(0))
|
|
|
|
|
g13_exit(2);
|
|
|
|
|
|
|
|
|
|
/* Now that we have the options parsed we need to update the default
|
|
|
|
|
control structure. */
|
|
|
|
|
g13_init_default_ctrl (&ctrl);
|
|
|
|
|
|
|
|
|
|
if (nogreeting)
|
|
|
|
|
greeting = 0;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
if (greeting)
|
|
|
|
|
{
|
2009-10-14 17:06:10 +00:00
|
|
|
|
fprintf (stderr, "%s %s; %s\n",
|
|
|
|
|
strusage(11), strusage(13), strusage(14) );
|
|
|
|
|
fprintf (stderr, "%s\n", strusage(15) );
|
2009-09-23 10:28:41 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (may_coredump && !opt.quiet)
|
|
|
|
|
log_info (_("WARNING: program may create a core file!\n"));
|
|
|
|
|
|
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] == '-')
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_info (_("NOTE: '%s' is not considered an option\n"), argv[i]);
|
2012-03-27 12:35:13 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
if (logfile)
|
|
|
|
|
{
|
|
|
|
|
log_set_file (logfile);
|
|
|
|
|
log_set_prefix (NULL, 1|2|4);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (gnupg_faked_time_p ())
|
|
|
|
|
{
|
|
|
|
|
gnupg_isotime_t tbuf;
|
|
|
|
|
|
|
|
|
|
log_info (_("WARNING: running with faked system time: "));
|
|
|
|
|
gnupg_get_isotime (tbuf);
|
|
|
|
|
dump_isotime (tbuf);
|
|
|
|
|
log_printf ("\n");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Print any pending secure memory warnings. */
|
|
|
|
|
gcry_control (GCRYCTL_RESUME_SECMEM_WARN);
|
|
|
|
|
|
|
|
|
|
/* Setup the debug flags for all subsystems. */
|
|
|
|
|
set_debug ();
|
|
|
|
|
|
|
|
|
|
/* Install a regular exit handler to make real sure that the secure
|
|
|
|
|
memory gets wiped out. */
|
|
|
|
|
if (atexit (emergency_cleanup))
|
|
|
|
|
{
|
|
|
|
|
log_error ("atexit failed\n");
|
|
|
|
|
g13_exit (2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Terminate if we found any error until now. */
|
|
|
|
|
if (log_get_errorcount(0))
|
|
|
|
|
g13_exit (2);
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
/* Set the standard GnuPG random seed file. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
if (use_random_seed)
|
2009-09-23 10:28:41 +00:00
|
|
|
|
{
|
|
|
|
|
char *p = make_filename (opt.homedir, "random_seed", NULL);
|
|
|
|
|
gcry_control (GCRYCTL_SET_RANDOM_SEED_FILE, p);
|
|
|
|
|
xfree(p);
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
/* Store given filename into FNAME. */
|
|
|
|
|
fname = argc? *argv : NULL;
|
|
|
|
|
|
|
|
|
|
/* Parse all given encryption keys. This does a lookup of the keys
|
|
|
|
|
and stops if any of the given keys was not found. */
|
2011-02-04 12:57:53 +01:00
|
|
|
|
#if 0 /* Currently not implemented. */
|
2009-09-23 10:28:41 +00:00
|
|
|
|
if (!nokeysetup)
|
|
|
|
|
{
|
|
|
|
|
strlist_t sl;
|
|
|
|
|
int failed = 0;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
for (sl = recipients; sl; sl = sl->next)
|
2009-10-19 09:18:46 +00:00
|
|
|
|
if (check_encryption_key ())
|
2009-09-23 10:28:41 +00:00
|
|
|
|
failed = 1;
|
|
|
|
|
if (failed)
|
|
|
|
|
g13_exit (1);
|
|
|
|
|
}
|
2011-02-04 12:57:53 +01:00
|
|
|
|
#endif /*0*/
|
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
/* Dispatch command. */
|
2012-01-03 17:08:01 +01:00
|
|
|
|
err = 0;
|
2009-09-23 10:28:41 +00:00
|
|
|
|
switch (cmd)
|
|
|
|
|
{
|
2011-02-04 12:57:53 +01:00
|
|
|
|
case aGPGConfList:
|
2009-09-23 10:28:41 +00:00
|
|
|
|
{ /* List options and default values in the GPG Conf format. */
|
|
|
|
|
char *config_filename_esc = percent_escape (opt.config_filename, NULL);
|
|
|
|
|
|
|
|
|
|
printf ("gpgconf-g13.conf:%lu:\"%s\n",
|
|
|
|
|
GC_OPT_FLAG_DEFAULT, config_filename_esc);
|
|
|
|
|
xfree (config_filename_esc);
|
|
|
|
|
|
|
|
|
|
printf ("verbose:%lu:\n", GC_OPT_FLAG_NONE);
|
|
|
|
|
printf ("quiet:%lu:\n", GC_OPT_FLAG_NONE);
|
|
|
|
|
printf ("debug-level:%lu:\"none:\n", GC_OPT_FLAG_DEFAULT);
|
|
|
|
|
printf ("log-file:%lu:\n", GC_OPT_FLAG_NONE);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case aGPGConfTest:
|
|
|
|
|
/* This is merely a dummy command to test whether the
|
|
|
|
|
configuration file is valid. */
|
|
|
|
|
break;
|
|
|
|
|
|
2009-10-14 17:06:10 +00:00
|
|
|
|
case aServer:
|
|
|
|
|
{
|
|
|
|
|
start_idle_task ();
|
2009-10-28 12:02:15 +00:00
|
|
|
|
ctrl.no_server = 0;
|
2009-10-14 17:06:10 +00:00
|
|
|
|
err = g13_server (&ctrl);
|
|
|
|
|
if (err)
|
|
|
|
|
log_error ("server exited with error: %s <%s>\n",
|
|
|
|
|
gpg_strerror (err), gpg_strsource (err));
|
2009-10-15 17:20:41 +00:00
|
|
|
|
else
|
|
|
|
|
shutdown_pending++;
|
2009-10-14 17:06:10 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
case aCreate: /* Create a new container. */
|
|
|
|
|
{
|
2011-02-04 12:57:53 +01:00
|
|
|
|
if (argc != 1)
|
2009-09-23 10:28:41 +00:00
|
|
|
|
wrong_args ("--create filename");
|
2009-10-14 17:06:10 +00:00
|
|
|
|
start_idle_task ();
|
2009-10-19 09:18:46 +00:00
|
|
|
|
err = g13_create_container (&ctrl, argv[0], recipients);
|
2009-09-30 15:28:38 +00:00
|
|
|
|
if (err)
|
|
|
|
|
log_error ("error creating a new container: %s <%s>\n",
|
|
|
|
|
gpg_strerror (err), gpg_strsource (err));
|
2009-10-15 17:20:41 +00:00
|
|
|
|
else
|
|
|
|
|
shutdown_pending++;
|
2009-10-13 19:17:24 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case aMount: /* Mount a container. */
|
|
|
|
|
{
|
2011-02-04 12:57:53 +01:00
|
|
|
|
if (argc != 1 && argc != 2 )
|
2009-10-13 19:17:24 +00:00
|
|
|
|
wrong_args ("--mount filename [mountpoint]");
|
2009-10-14 17:06:10 +00:00
|
|
|
|
start_idle_task ();
|
2009-10-13 19:17:24 +00:00
|
|
|
|
err = g13_mount_container (&ctrl, argv[0], argc == 2?argv[1]:NULL);
|
|
|
|
|
if (err)
|
2012-06-05 19:29:22 +02:00
|
|
|
|
log_error ("error mounting container '%s': %s <%s>\n",
|
2009-10-13 19:17:24 +00:00
|
|
|
|
*argv, gpg_strerror (err), gpg_strsource (err));
|
2009-09-23 10:28:41 +00:00
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
2009-10-13 19:17:24 +00:00
|
|
|
|
log_error (_("invalid command (there is no implicit command)\n"));
|
|
|
|
|
break;
|
2009-09-23 10:28:41 +00:00
|
|
|
|
}
|
|
|
|
|
|
2009-10-14 17:06:10 +00:00
|
|
|
|
if (!err)
|
|
|
|
|
join_idle_task ();
|
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
/* Cleanup. */
|
|
|
|
|
g13_exit (0);
|
|
|
|
|
return 8; /*NOTREACHED*/
|
|
|
|
|
}
|
|
|
|
|
|
2009-10-14 17:06:10 +00:00
|
|
|
|
|
2009-09-23 10:28:41 +00:00
|
|
|
|
/* Note: This function is used by signal handlers!. */
|
|
|
|
|
static void
|
|
|
|
|
emergency_cleanup (void)
|
|
|
|
|
{
|
|
|
|
|
gcry_control (GCRYCTL_TERM_SECMEM );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
g13_exit (int rc)
|
|
|
|
|
{
|
|
|
|
|
gcry_control (GCRYCTL_UPDATE_RANDOM_SEED_FILE);
|
|
|
|
|
if (opt.debug & DBG_MEMSTAT_VALUE)
|
|
|
|
|
{
|
|
|
|
|
gcry_control( GCRYCTL_DUMP_MEMORY_STATS );
|
|
|
|
|
gcry_control( GCRYCTL_DUMP_RANDOM_STATS );
|
|
|
|
|
}
|
|
|
|
|
if (opt.debug)
|
|
|
|
|
gcry_control (GCRYCTL_DUMP_SECMEM_STATS );
|
|
|
|
|
emergency_cleanup ();
|
|
|
|
|
rc = rc? rc : log_get_errorcount(0)? 2 : g13_errors_seen? 1 : 0;
|
|
|
|
|
exit (rc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-10-14 17:06:10 +00:00
|
|
|
|
/* Store defaults into the per-connection CTRL object. */
|
2009-09-23 10:28:41 +00:00
|
|
|
|
void
|
|
|
|
|
g13_init_default_ctrl (struct server_control_s *ctrl)
|
|
|
|
|
{
|
2009-09-30 15:28:38 +00:00
|
|
|
|
ctrl->conttype = CONTTYPE_ENCFS;
|
2009-09-23 10:28:41 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2009-10-14 17:06:10 +00:00
|
|
|
|
/* This function is called for each signal we catch. It is run in the
|
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
|
|
|
|
main context or the one of a NPth thread and thus it is not
|
2009-10-14 17:06:10 +00:00
|
|
|
|
restricted in what it may do. */
|
|
|
|
|
static void
|
|
|
|
|
handle_signal (int signo)
|
|
|
|
|
{
|
|
|
|
|
switch (signo)
|
|
|
|
|
{
|
|
|
|
|
#ifndef HAVE_W32_SYSTEM
|
|
|
|
|
case SIGHUP:
|
|
|
|
|
log_info ("SIGHUP received - re-reading configuration\n");
|
|
|
|
|
/* Fixme: Not yet implemented. */
|
|
|
|
|
break;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-10-14 17:06:10 +00:00
|
|
|
|
case SIGUSR1:
|
|
|
|
|
log_info ("SIGUSR1 received - printing internal information:\n");
|
2010-03-11 12:34:11 +00:00
|
|
|
|
/* Fixme: We need to see how to integrate pth dumping into our
|
|
|
|
|
logging system. */
|
|
|
|
|
/* pth_ctrl (PTH_CTRL_DUMPSTATE, log_get_stream ()); */
|
2009-10-15 17:20:41 +00:00
|
|
|
|
mountinfo_dump_all ();
|
2009-10-14 17:06:10 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
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 %u runners active\n",
|
|
|
|
|
runner_get_threads ());
|
|
|
|
|
shutdown_pending++;
|
|
|
|
|
if (shutdown_pending > 2)
|
|
|
|
|
{
|
|
|
|
|
log_info ("shutdown forced\n");
|
|
|
|
|
log_info ("%s %s stopped\n", strusage(11), strusage(13) );
|
|
|
|
|
g13_exit (0);
|
|
|
|
|
}
|
|
|
|
|
break;
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-10-14 17:06:10 +00:00
|
|
|
|
case SIGINT:
|
|
|
|
|
log_info ("SIGINT received - immediate shutdown\n");
|
|
|
|
|
log_info( "%s %s stopped\n", strusage(11), strusage(13));
|
|
|
|
|
g13_exit (0);
|
|
|
|
|
break;
|
|
|
|
|
#endif /*!HAVE_W32_SYSTEM*/
|
2011-02-04 12:57:53 +01:00
|
|
|
|
|
2009-10-14 17:06:10 +00:00
|
|
|
|
default:
|
|
|
|
|
log_info ("signal %d received - no action defined\n", signo);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* This ticker function is called about every TIMERTICK_INTERVAL_SEC
|
|
|
|
|
seconds. */
|
|
|
|
|
static void
|
|
|
|
|
handle_tick (void)
|
|
|
|
|
{
|
|
|
|
|
/* log_debug ("TICK\n"); */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* The idle task. We use a separate thread to do idle stuff and to
|
|
|
|
|
catch signals. */
|
|
|
|
|
static void *
|
|
|
|
|
idle_task (void *dummy_arg)
|
|
|
|
|
{
|
|
|
|
|
int signo; /* The number of a raised signal is stored here. */
|
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
|
|
|
|
int saved_errno;
|
|
|
|
|
struct timespec abstime;
|
|
|
|
|
struct timespec curtime;
|
|
|
|
|
struct timespec timeout;
|
|
|
|
|
int ret;
|
2009-10-14 17:06:10 +00:00
|
|
|
|
|
|
|
|
|
(void)dummy_arg;
|
|
|
|
|
|
|
|
|
|
/* Create the event to catch the signals. */
|
|
|
|
|
#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_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 ();
|
2009-10-14 17:06:10 +00:00
|
|
|
|
#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
|
|
|
|
npth_clock_gettime (&abstime);
|
|
|
|
|
abstime.tv_sec += TIMERTICK_INTERVAL_SEC;
|
2009-10-14 17:06:10 +00:00
|
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
/* The shutdown flag allows us to terminate the idle task. */
|
|
|
|
|
if (shutdown_pending)
|
|
|
|
|
{
|
|
|
|
|
runner_cancel_all ();
|
|
|
|
|
|
|
|
|
|
if (!runner_get_threads ())
|
|
|
|
|
break; /* ready */
|
|
|
|
|
}
|
|
|
|
|
|
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_SEC;
|
|
|
|
|
}
|
|
|
|
|
npth_timersub (&abstime, &curtime, &timeout);
|
2009-10-14 17:06:10 +00: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 (0, NULL, NULL, NULL, &timeout, npth_sigev_sigmask());
|
|
|
|
|
saved_errno = errno;
|
2009-10-14 17:06:10 +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
|
|
|
|
while (npth_sigev_get_pending(&signo))
|
|
|
|
|
handle_signal (signo);
|
2012-01-19 22:27:44 +01:00
|
|
|
|
#else
|
|
|
|
|
ret = npth_eselect (0, NULL, 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
|
2009-10-14 17:06:10 +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);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2009-10-14 17:06:10 +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 <= 0)
|
|
|
|
|
/* Interrupt or timeout. Will be handled when calculating the
|
|
|
|
|
next timeout. */
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* Here one would add processing of file descriptors. */
|
2009-10-14 17:06:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
log_info (_("%s %s stopped\n"), strusage(11), strusage(13));
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Start the idle task. */
|
|
|
|
|
static void
|
|
|
|
|
start_idle_task (void)
|
|
|
|
|
{
|
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;
|
|
|
|
|
npth_t thread;
|
|
|
|
|
sigset_t sigs; /* The set of signals we want to catch. */
|
|
|
|
|
int err;
|
|
|
|
|
|
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
|
|
|
|
/* These signals should always go to the idle task, so they need to
|
|
|
|
|
be blocked everywhere else. We assume start_idle_task is called
|
|
|
|
|
from the main thread before any other threads are created. */
|
|
|
|
|
sigemptyset (&sigs);
|
|
|
|
|
sigaddset (&sigs, SIGHUP);
|
|
|
|
|
sigaddset (&sigs, SIGUSR1);
|
|
|
|
|
sigaddset (&sigs, SIGUSR2);
|
|
|
|
|
sigaddset (&sigs, SIGINT);
|
|
|
|
|
sigaddset (&sigs, SIGTERM);
|
|
|
|
|
npth_sigmask (SIG_BLOCK, &sigs, NULL);
|
2012-01-19 22:27:44 +01:00
|
|
|
|
#endif
|
2011-02-04 12:57:53 +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_init (&tattr);
|
|
|
|
|
npth_attr_setdetachstate (&tattr, NPTH_CREATE_JOINABLE);
|
2011-02-04 12:57:53 +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
|
|
|
|
err = npth_create (&thread, &tattr, idle_task, NULL);
|
|
|
|
|
if (err)
|
2009-10-14 17:06:10 +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
|
|
|
|
log_fatal ("error starting idle task: %s\n", strerror (err));
|
2009-10-14 17:06:10 +00:00
|
|
|
|
return; /*NOTREACHED*/
|
|
|
|
|
}
|
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, "idle-task");
|
|
|
|
|
idle_task_thread = thread;
|
|
|
|
|
npth_attr_destroy (&tattr);
|
2009-10-14 17:06:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Wait for the idle task to finish. */
|
|
|
|
|
static void
|
|
|
|
|
join_idle_task (void)
|
|
|
|
|
{
|
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
|
|
|
|
int err;
|
|
|
|
|
|
|
|
|
|
/* FIXME: This assumes that a valid pthread_t is non-null. That is
|
|
|
|
|
not guaranteed. */
|
|
|
|
|
if (idle_task_thread)
|
2009-10-14 17:06:10 +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
|
|
|
|
err = npth_join (idle_task_thread, NULL);
|
|
|
|
|
if (err)
|
2009-10-14 17:06:10 +00:00
|
|
|
|
log_error ("waiting for idle task thread failed: %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 (err));
|
2009-10-14 17:06:10 +00:00
|
|
|
|
}
|
|
|
|
|
}
|