2004-01-29 00:58:18 +01:00
|
|
|
|
/* gpgconf-comp.c - Configuration utility for GnuPG.
|
2016-12-16 16:00:15 +01:00
|
|
|
|
* Copyright (C) 2004, 2007-2011 Free Software Foundation, Inc.
|
|
|
|
|
* Copyright (C) 2016 Werner Koch
|
2021-03-26 14:44:17 +01:00
|
|
|
|
* Copyright (C) 2020, 2021 g10 Code GmbH
|
2006-06-20 19:21:37 +02:00
|
|
|
|
*
|
|
|
|
|
* 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
|
2007-07-04 21:49:40 +02:00
|
|
|
|
* the Free Software Foundation; either version 3 of the License, or
|
2006-06-20 19:21:37 +02:00
|
|
|
|
* (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
|
2016-11-05 12:02:19 +01:00
|
|
|
|
* along with GnuPG; if not, see <https://www.gnu.org/licenses/>.
|
2021-03-26 14:44:17 +01:00
|
|
|
|
* SPDX-License-Identifier: GPL-3.0-or-later
|
2006-06-20 19:21:37 +02:00
|
|
|
|
*/
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
|
|
|
|
#if HAVE_CONFIG_H
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#endif
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <time.h>
|
2004-01-30 13:15:53 +01:00
|
|
|
|
#include <stdarg.h>
|
2010-03-29 14:57:11 +02:00
|
|
|
|
#ifdef HAVE_SIGNAL_H
|
|
|
|
|
# include <signal.h>
|
|
|
|
|
#endif
|
2007-08-29 18:59:20 +02:00
|
|
|
|
#include <ctype.h>
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
# define WIN32_LEAN_AND_MEAN 1
|
|
|
|
|
# include <windows.h>
|
|
|
|
|
#else
|
|
|
|
|
# include <pwd.h>
|
|
|
|
|
# include <grp.h>
|
2007-06-06 20:12:30 +02:00
|
|
|
|
#endif
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2017-03-07 12:21:23 +01:00
|
|
|
|
#include "../common/util.h"
|
|
|
|
|
#include "../common/i18n.h"
|
|
|
|
|
#include "../common/sysutils.h"
|
2017-12-18 17:46:05 +01:00
|
|
|
|
#include "../common/status.h"
|
2004-01-30 11:38:07 +01:00
|
|
|
|
|
2017-03-07 12:21:23 +01:00
|
|
|
|
#include "../common/gc-opt-flags.h"
|
2004-01-29 00:58:18 +01:00
|
|
|
|
#include "gpgconf.h"
|
|
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2004-01-30 13:15:53 +01:00
|
|
|
|
|
2004-03-09 15:34:12 +01:00
|
|
|
|
#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 ))
|
2004-01-30 13:15:53 +01:00
|
|
|
|
void gc_error (int status, int errnum, const char *fmt, ...) \
|
|
|
|
|
__attribute__ ((format (printf, 3, 4)));
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Output a diagnostic message. If ERRNUM is not 0, then the output
|
|
|
|
|
is followed by a colon, a white space, and the error string for the
|
|
|
|
|
error number ERRNUM. In any case the output is finished by a
|
|
|
|
|
newline. The message is prepended by the program name, a colon,
|
|
|
|
|
and a whitespace. The output may be further formatted or
|
|
|
|
|
redirected by the jnlib logging facility. */
|
|
|
|
|
void
|
|
|
|
|
gc_error (int status, int errnum, const char *fmt, ...)
|
|
|
|
|
{
|
|
|
|
|
va_list arg_ptr;
|
|
|
|
|
|
|
|
|
|
va_start (arg_ptr, fmt);
|
2017-12-11 10:37:30 +01:00
|
|
|
|
log_logv (GPGRT_LOGLVL_ERROR, fmt, arg_ptr);
|
2004-01-30 13:15:53 +01:00
|
|
|
|
va_end (arg_ptr);
|
|
|
|
|
|
|
|
|
|
if (errnum)
|
|
|
|
|
log_printf (": %s\n", strerror (errnum));
|
|
|
|
|
else
|
|
|
|
|
log_printf ("\n");
|
|
|
|
|
|
|
|
|
|
if (status)
|
|
|
|
|
{
|
|
|
|
|
log_printf (NULL);
|
|
|
|
|
log_printf ("fatal error (exit status %i)\n", status);
|
2017-12-18 17:46:05 +01:00
|
|
|
|
gpgconf_failure (gpg_error_from_errno (errnum));
|
2004-01-30 13:15:53 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2004-03-23 13:21:48 +01:00
|
|
|
|
/* Forward declaration. */
|
2011-02-23 10:15:34 +01:00
|
|
|
|
static void gpg_agent_runtime_change (int killflag);
|
|
|
|
|
static void scdaemon_runtime_change (int killflag);
|
2021-04-23 04:10:04 +02:00
|
|
|
|
#ifdef BUILD_WITH_TPM2D
|
2021-03-09 22:50:28 +01:00
|
|
|
|
static void tpm2daemon_runtime_change (int killflag);
|
2021-04-23 04:10:04 +02:00
|
|
|
|
#endif
|
2014-11-19 10:31:34 +01:00
|
|
|
|
static void dirmngr_runtime_change (int killflag);
|
2020-09-23 12:02:50 +02:00
|
|
|
|
static void keyboxd_runtime_change (int killflag);
|
2004-03-23 13:21:48 +01:00
|
|
|
|
|
2007-08-29 11:51:37 +02:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
|
|
|
|
|
/* STRING_ARRAY is a malloced array with malloced strings. It is used
|
|
|
|
|
* a space to store strings so that other objects may point to these
|
2024-05-13 00:09:23 +02:00
|
|
|
|
* strings. It shall never be shrunk or any items changed.
|
2020-03-12 10:16:56 +01:00
|
|
|
|
* STRING_ARRAY itself may be reallocated to increase the size of the
|
|
|
|
|
* table. STRING_ARRAY_USED is the number of items currently used,
|
|
|
|
|
* STRING_ARRAY_SIZE is the number of calloced slots. */
|
|
|
|
|
static char **string_array;
|
|
|
|
|
static size_t string_array_used;
|
|
|
|
|
static size_t string_array_size;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Option configuration. */
|
|
|
|
|
|
|
|
|
|
/* An option might take an argument, or not. Argument types can be
|
|
|
|
|
basic or complex. Basic types are generic and easy to validate.
|
|
|
|
|
Complex types provide more specific information about the intended
|
|
|
|
|
use, but can be difficult to validate. If you add to this enum,
|
|
|
|
|
don't forget to update GC_ARG_TYPE below. YOU MUST NOT CHANGE THE
|
|
|
|
|
NUMBERS OF THE EXISTING ENTRIES, AS THEY ARE PART OF THE EXTERNAL
|
|
|
|
|
INTERFACE. */
|
|
|
|
|
typedef enum
|
|
|
|
|
{
|
|
|
|
|
/* Basic argument types. */
|
|
|
|
|
|
|
|
|
|
/* No argument. */
|
|
|
|
|
GC_ARG_TYPE_NONE = 0,
|
|
|
|
|
|
|
|
|
|
/* A String argument. */
|
|
|
|
|
GC_ARG_TYPE_STRING = 1,
|
|
|
|
|
|
|
|
|
|
/* A signed integer argument. */
|
|
|
|
|
GC_ARG_TYPE_INT32 = 2,
|
|
|
|
|
|
|
|
|
|
/* An unsigned integer argument. */
|
|
|
|
|
GC_ARG_TYPE_UINT32 = 3,
|
|
|
|
|
|
2004-02-24 15:31:59 +01:00
|
|
|
|
/* ADD NEW BASIC TYPE ENTRIES HERE. */
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
|
|
|
|
/* Complex argument types. */
|
|
|
|
|
|
2008-05-26 17:05:31 +02:00
|
|
|
|
/* A complete filename. */
|
|
|
|
|
GC_ARG_TYPE_FILENAME = 32,
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
|
|
|
|
/* An LDAP server in the format
|
|
|
|
|
HOSTNAME:PORT:USERNAME:PASSWORD:BASE_DN. */
|
2004-02-24 15:31:59 +01:00
|
|
|
|
GC_ARG_TYPE_LDAP_SERVER = 33,
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
|
|
|
|
/* A 40 character fingerprint. */
|
2004-02-24 15:31:59 +01:00
|
|
|
|
GC_ARG_TYPE_KEY_FPR = 34,
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2008-02-27 18:32:47 +01:00
|
|
|
|
/* A user ID or key ID or fingerprint for a certificate. */
|
|
|
|
|
GC_ARG_TYPE_PUB_KEY = 35,
|
|
|
|
|
|
|
|
|
|
/* A user ID or key ID or fingerprint for a certificate with a key. */
|
|
|
|
|
GC_ARG_TYPE_SEC_KEY = 36,
|
|
|
|
|
|
2008-06-19 15:09:40 +02:00
|
|
|
|
/* A alias list made up of a key, an equal sign and a space
|
|
|
|
|
separated list of values. */
|
|
|
|
|
GC_ARG_TYPE_ALIAS_LIST = 37,
|
|
|
|
|
|
2004-02-24 15:31:59 +01:00
|
|
|
|
/* ADD NEW COMPLEX TYPE ENTRIES HERE. */
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
|
|
|
|
/* The number of the above entries. */
|
|
|
|
|
GC_ARG_TYPE_NR
|
|
|
|
|
} gc_arg_type_t;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* For every argument, we record some information about it in the
|
|
|
|
|
following struct. */
|
2017-07-19 06:43:23 +02:00
|
|
|
|
static const struct
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
|
|
|
|
/* For every argument type exists a basic argument type that can be
|
|
|
|
|
used as a fallback for input and validation purposes. */
|
|
|
|
|
gc_arg_type_t fallback;
|
|
|
|
|
|
|
|
|
|
/* Human-readable name of the type. */
|
|
|
|
|
const char *name;
|
|
|
|
|
} gc_arg_type[GC_ARG_TYPE_NR] =
|
|
|
|
|
{
|
|
|
|
|
/* The basic argument types have their own types as fallback. */
|
|
|
|
|
{ GC_ARG_TYPE_NONE, "none" },
|
|
|
|
|
{ GC_ARG_TYPE_STRING, "string" },
|
|
|
|
|
{ GC_ARG_TYPE_INT32, "int32" },
|
|
|
|
|
{ GC_ARG_TYPE_UINT32, "uint32" },
|
|
|
|
|
|
2004-02-24 15:31:59 +01:00
|
|
|
|
/* Reserved basic type entries for future extension. */
|
|
|
|
|
{ GC_ARG_TYPE_NR, NULL }, { GC_ARG_TYPE_NR, NULL },
|
|
|
|
|
{ GC_ARG_TYPE_NR, NULL }, { GC_ARG_TYPE_NR, NULL },
|
|
|
|
|
{ GC_ARG_TYPE_NR, NULL }, { GC_ARG_TYPE_NR, NULL },
|
|
|
|
|
{ GC_ARG_TYPE_NR, NULL }, { GC_ARG_TYPE_NR, NULL },
|
|
|
|
|
{ GC_ARG_TYPE_NR, NULL }, { GC_ARG_TYPE_NR, NULL },
|
|
|
|
|
{ GC_ARG_TYPE_NR, NULL }, { GC_ARG_TYPE_NR, NULL },
|
|
|
|
|
{ GC_ARG_TYPE_NR, NULL }, { GC_ARG_TYPE_NR, NULL },
|
|
|
|
|
{ GC_ARG_TYPE_NR, NULL }, { GC_ARG_TYPE_NR, NULL },
|
|
|
|
|
{ GC_ARG_TYPE_NR, NULL }, { GC_ARG_TYPE_NR, NULL },
|
|
|
|
|
{ GC_ARG_TYPE_NR, NULL }, { GC_ARG_TYPE_NR, NULL },
|
|
|
|
|
{ GC_ARG_TYPE_NR, NULL }, { GC_ARG_TYPE_NR, NULL },
|
|
|
|
|
{ GC_ARG_TYPE_NR, NULL }, { GC_ARG_TYPE_NR, NULL },
|
|
|
|
|
{ GC_ARG_TYPE_NR, NULL }, { GC_ARG_TYPE_NR, NULL },
|
|
|
|
|
{ GC_ARG_TYPE_NR, NULL }, { GC_ARG_TYPE_NR, NULL },
|
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
/* The complex argument types have a basic type as fallback. */
|
2008-05-26 17:05:31 +02:00
|
|
|
|
{ GC_ARG_TYPE_STRING, "filename" },
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{ GC_ARG_TYPE_STRING, "ldap server" },
|
|
|
|
|
{ GC_ARG_TYPE_STRING, "key fpr" },
|
2008-02-27 18:32:47 +01:00
|
|
|
|
{ GC_ARG_TYPE_STRING, "pub key" },
|
|
|
|
|
{ GC_ARG_TYPE_STRING, "sec key" },
|
2008-06-19 15:09:40 +02:00
|
|
|
|
{ GC_ARG_TYPE_STRING, "alias list" },
|
2004-01-29 00:58:18 +01:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Every option has an associated expert level, than can be used to
|
|
|
|
|
hide advanced and expert options from beginners. If you add to
|
|
|
|
|
this list, don't forget to update GC_LEVEL below. YOU MUST NOT
|
|
|
|
|
CHANGE THE NUMBERS OF THE EXISTING ENTRIES, AS THEY ARE PART OF THE
|
|
|
|
|
EXTERNAL INTERFACE. */
|
|
|
|
|
typedef enum
|
|
|
|
|
{
|
|
|
|
|
/* The basic options should always be displayed. */
|
|
|
|
|
GC_LEVEL_BASIC,
|
|
|
|
|
|
|
|
|
|
/* The advanced options may be hidden from beginners. */
|
|
|
|
|
GC_LEVEL_ADVANCED,
|
|
|
|
|
|
|
|
|
|
/* The expert options should only be displayed to experts. */
|
|
|
|
|
GC_LEVEL_EXPERT,
|
|
|
|
|
|
|
|
|
|
/* The invisible options should normally never be displayed. */
|
|
|
|
|
GC_LEVEL_INVISIBLE,
|
|
|
|
|
|
|
|
|
|
/* The internal options are never exported, they mark options that
|
|
|
|
|
are recorded for internal use only. */
|
|
|
|
|
GC_LEVEL_INTERNAL,
|
|
|
|
|
|
|
|
|
|
/* ADD NEW ENTRIES HERE. */
|
|
|
|
|
|
|
|
|
|
/* The number of the above entries. */
|
|
|
|
|
GC_LEVEL_NR
|
|
|
|
|
} gc_expert_level_t;
|
|
|
|
|
|
|
|
|
|
/* A description for each expert level. */
|
2017-07-19 06:43:23 +02:00
|
|
|
|
static const struct
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
|
|
|
|
const char *name;
|
|
|
|
|
} gc_level[] =
|
|
|
|
|
{
|
|
|
|
|
{ "basic" },
|
|
|
|
|
{ "advanced" },
|
|
|
|
|
{ "expert" },
|
|
|
|
|
{ "invisible" },
|
|
|
|
|
{ "internal" }
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* Option flags. The flags which are used by the components are defined
|
2007-08-02 20:12:43 +02:00
|
|
|
|
by gc-opt-flags.h, included above.
|
|
|
|
|
|
|
|
|
|
YOU MUST NOT CHANGE THE NUMBERS OF THE EXISTING FLAGS, AS THEY ARE
|
|
|
|
|
PART OF THE EXTERNAL INTERFACE. */
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* Some entries in the emitted option list are not options, but mark
|
|
|
|
|
the beginning of a new group of options. These entries have the
|
|
|
|
|
GROUP flag set. Note that this is internally also known as a
|
|
|
|
|
header line. */
|
2004-02-24 15:31:59 +01:00
|
|
|
|
#define GC_OPT_FLAG_GROUP (1UL << 0)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
/* The ARG_OPT flag for an option indicates that the argument is
|
2004-02-26 17:28:27 +01:00
|
|
|
|
optional. This is never set for GC_ARG_TYPE_NONE options. */
|
2004-02-24 15:31:59 +01:00
|
|
|
|
#define GC_OPT_FLAG_ARG_OPT (1UL << 1)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
/* The LIST flag for an option indicates that the option can occur
|
|
|
|
|
several times. A comma separated list of arguments is used as the
|
|
|
|
|
argument value. */
|
2004-02-24 15:31:59 +01:00
|
|
|
|
#define GC_OPT_FLAG_LIST (1UL << 2)
|
2020-03-14 18:53:43 +01:00
|
|
|
|
/* The RUNTIME flag for an option indicates that the option can be
|
|
|
|
|
changed at runtime. */
|
|
|
|
|
#define GC_OPT_FLAG_RUNTIME (1UL << 3)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2007-08-02 20:12:43 +02:00
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
/* A human-readable description for each flag. */
|
2017-07-19 06:43:23 +02:00
|
|
|
|
static const struct
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
|
|
|
|
const char *name;
|
|
|
|
|
} gc_flag[] =
|
|
|
|
|
{
|
|
|
|
|
{ "group" },
|
|
|
|
|
{ "optional arg" },
|
|
|
|
|
{ "list" },
|
2004-03-23 13:33:59 +01:00
|
|
|
|
{ "runtime" },
|
|
|
|
|
{ "default" },
|
|
|
|
|
{ "default desc" },
|
2007-03-06 21:44:41 +01:00
|
|
|
|
{ "no arg desc" },
|
|
|
|
|
{ "no change" }
|
2004-01-29 00:58:18 +01:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
|
|
|
|
|
/* Each option we want to support in gpgconf has the needed
|
2024-05-13 00:09:23 +02:00
|
|
|
|
* information in a static list per component. This struct describes
|
2020-03-12 10:16:56 +01:00
|
|
|
|
* the info for a single option. */
|
|
|
|
|
struct known_option_s
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
|
|
|
|
/* If this is NULL, then this is a terminator in an array of unknown
|
2020-03-12 10:16:56 +01:00
|
|
|
|
* length. Otherwise it is the name of the option described by this
|
|
|
|
|
* entry. The name must not contain a colon. */
|
2004-01-29 00:58:18 +01:00
|
|
|
|
const char *name;
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The option flags. */
|
2004-02-24 15:31:59 +01:00
|
|
|
|
unsigned long flags;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The expert level. */
|
2004-01-29 00:58:18 +01:00
|
|
|
|
gc_expert_level_t level;
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The complex type of the option argument; the default of 0 is used
|
|
|
|
|
* for a standard type as returned by --dump-option-table. */
|
|
|
|
|
gc_arg_type_t arg_type;
|
|
|
|
|
};
|
|
|
|
|
typedef struct known_option_s known_option_t;
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The known options of the GC_COMPONENT_GPG_AGENT component. */
|
|
|
|
|
static known_option_t known_options_gpg_agent[] =
|
|
|
|
|
{
|
|
|
|
|
{ "verbose", GC_OPT_FLAG_LIST|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
|
|
|
|
|
{ "quiet", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
|
|
|
|
|
{ "disable-scdaemon", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "enable-ssh-support", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "ssh-fingerprint-digest", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
|
|
|
|
|
{ "enable-putty-support", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "enable-extended-key-format", GC_OPT_FLAG_RUNTIME, GC_LEVEL_INVISIBLE },
|
|
|
|
|
{ "debug-level", GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED},
|
|
|
|
|
{ "log-file", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED,
|
|
|
|
|
/**/ GC_ARG_TYPE_FILENAME },
|
|
|
|
|
{ "faked-system-time", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
|
|
|
|
|
|
|
|
|
{ "default-cache-ttl", GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
|
|
|
|
|
{ "default-cache-ttl-ssh", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "max-cache-ttl", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
|
|
|
|
|
{ "max-cache-ttl-ssh", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
|
|
|
|
|
{ "ignore-cache-for-signing", GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
|
|
|
|
|
{ "allow-emacs-pinentry", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "grab", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
|
|
|
|
|
{ "no-allow-external-cache", GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
|
|
|
|
|
{ "no-allow-mark-trusted", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "no-allow-loopback-pinentry", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
|
|
|
|
|
|
|
|
|
|
{ "enforce-passphrase-constraints", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
|
|
|
|
|
{ "min-passphrase-len", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "min-passphrase-nonalpha", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
|
|
|
|
|
{ "check-passphrase-pattern", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT,
|
|
|
|
|
/**/ GC_ARG_TYPE_FILENAME },
|
2021-08-13 13:42:31 +02:00
|
|
|
|
{ "check-sym-passphrase-pattern", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT,
|
|
|
|
|
/**/ GC_ARG_TYPE_FILENAME },
|
2020-03-12 10:16:56 +01:00
|
|
|
|
{ "max-passphrase-days", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
|
|
|
|
|
{ "enable-passphrase-history", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
|
|
|
|
|
{ "pinentry-timeout", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED },
|
|
|
|
|
|
|
|
|
|
{ NULL }
|
|
|
|
|
};
|
2004-09-29 18:16:47 +02:00
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The known options of the GC_COMPONENT_SCDAEMON component. */
|
|
|
|
|
static known_option_t known_options_scdaemon[] =
|
|
|
|
|
{
|
|
|
|
|
{ "verbose", GC_OPT_FLAG_LIST|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
|
|
|
|
|
{ "quiet", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "no-greeting", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
|
|
|
|
{ "reader-port", GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
|
|
|
|
|
{ "ctapi-driver", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "pcsc-driver", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "disable-ccid", GC_OPT_FLAG_RUNTIME, GC_LEVEL_EXPERT },
|
|
|
|
|
{ "disable-pinpad", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
|
|
|
|
|
{ "enable-pinpad-varlen", GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
|
|
|
|
|
{ "card-timeout", GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
|
|
|
|
|
{ "application-priority", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "debug-level", GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED},
|
|
|
|
|
{ "log-file", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED,
|
|
|
|
|
GC_ARG_TYPE_FILENAME },
|
|
|
|
|
{ "deny-admin", GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
|
|
|
|
|
|
|
|
|
|
{ NULL }
|
|
|
|
|
};
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2021-04-23 04:10:04 +02:00
|
|
|
|
#ifdef BUILD_WITH_TPM2D
|
2021-03-09 22:50:28 +01:00
|
|
|
|
/* The known options of the GC_COMPONENT_TPM2DAEMON component. */
|
|
|
|
|
static known_option_t known_options_tpm2daemon[] =
|
|
|
|
|
{
|
|
|
|
|
{ "verbose", GC_OPT_FLAG_LIST|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
|
|
|
|
|
{ "quiet", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "no-greeting", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
|
|
|
|
{ "debug-level", GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED},
|
|
|
|
|
{ "log-file", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED,
|
|
|
|
|
GC_ARG_TYPE_FILENAME },
|
|
|
|
|
{ "deny-admin", GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC },
|
|
|
|
|
{ "parent", GC_OPT_FLAG_RUNTIME, GC_LEVEL_ADVANCED },
|
|
|
|
|
|
|
|
|
|
{ NULL }
|
|
|
|
|
};
|
2021-04-23 04:10:04 +02:00
|
|
|
|
#endif
|
2021-03-09 22:50:28 +01:00
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The known options of the GC_COMPONENT_GPG component. */
|
|
|
|
|
static known_option_t known_options_gpg[] =
|
|
|
|
|
{
|
|
|
|
|
{ "verbose", GC_OPT_FLAG_LIST, GC_LEVEL_BASIC },
|
|
|
|
|
{ "quiet", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "no-greeting", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
|
|
|
|
{ "default-key", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "encrypt-to", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "group", GC_OPT_FLAG_LIST, GC_LEVEL_ADVANCED,
|
|
|
|
|
GC_ARG_TYPE_ALIAS_LIST},
|
|
|
|
|
{ "compliance", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT },
|
|
|
|
|
{ "default-new-key-algo", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
2024-07-01 15:47:03 +02:00
|
|
|
|
{ "default-new-key-adsk", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
|
|
|
|
{ "add-desig-revoker", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
|
|
|
|
{ "trusted-key", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
2020-03-12 10:16:56 +01:00
|
|
|
|
{ "trust-model", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
|
|
|
|
{ "debug-level", GC_OPT_FLAG_ARG_OPT, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "log-file", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
|
|
|
|
GC_ARG_TYPE_FILENAME },
|
2021-11-03 15:16:26 +01:00
|
|
|
|
{ "keyserver", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
2020-03-12 10:16:56 +01:00
|
|
|
|
{ "auto-key-locate", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
|
2020-03-14 18:04:47 +01:00
|
|
|
|
{ "auto-key-import", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
2020-03-12 10:16:56 +01:00
|
|
|
|
{ "auto-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT },
|
2020-03-14 18:04:47 +01:00
|
|
|
|
{ "include-key-block", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
2020-03-12 10:16:56 +01:00
|
|
|
|
{ "disable-dirmngr", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT },
|
|
|
|
|
{ "max-cert-depth", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
|
|
|
|
{ "completes-needed", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
|
|
|
|
{ "marginals-needed", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
|
|
|
|
|
2021-04-01 13:11:16 +02:00
|
|
|
|
/* The next items are pseudo options which we read via --gpgconf-list.
|
2021-03-23 12:16:37 +01:00
|
|
|
|
* The meta information is taken from the table below. */
|
|
|
|
|
{ "default_pubkey_algo", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
2021-04-01 13:11:16 +02:00
|
|
|
|
{ "compliance_de_vs", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
2021-04-19 11:33:19 +02:00
|
|
|
|
{ "use_keyboxd", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
2021-03-22 19:41:44 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
{ NULL }
|
|
|
|
|
};
|
2021-03-23 12:16:37 +01:00
|
|
|
|
static const char *known_pseudo_options_gpg[] =
|
|
|
|
|
{/* v-- ARGPARSE_TYPE_STRING */
|
|
|
|
|
"default_pubkey_algo:0:2:@:",
|
2021-04-01 13:11:16 +02:00
|
|
|
|
/* A basic compliance check for gpg. We use gpg here but the
|
|
|
|
|
* result is valid for all components.
|
|
|
|
|
* v-- ARGPARSE_TYPE_INT */
|
|
|
|
|
"compliance_de_vs:0:1:@:",
|
2021-04-19 11:33:19 +02:00
|
|
|
|
/* True is use_keyboxd is enabled. That option can be set in
|
2024-05-13 00:09:23 +02:00
|
|
|
|
* common.conf but is not directly supported by gpgconf. Thus we
|
2021-04-19 11:33:19 +02:00
|
|
|
|
* only allow to read it out.
|
|
|
|
|
* v-- ARGPARSE_TYPE_INT */
|
|
|
|
|
"use_keyboxd:0:1:@:",
|
2021-03-23 12:16:37 +01:00
|
|
|
|
NULL
|
|
|
|
|
};
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2020-03-05 16:23:52 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The known options of the GC_COMPONENT_GPGSM component. */
|
|
|
|
|
static known_option_t known_options_gpgsm[] =
|
|
|
|
|
{
|
|
|
|
|
{ "verbose", GC_OPT_FLAG_LIST, GC_LEVEL_BASIC },
|
|
|
|
|
{ "quiet", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "no-greeting", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
|
|
|
|
{ "default-key", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "encrypt-to", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "disable-dirmngr", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT },
|
|
|
|
|
{ "p12-charset", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
|
2022-01-27 14:40:53 +01:00
|
|
|
|
{ "keyserver", GC_OPT_FLAG_LIST, GC_LEVEL_INVISIBLE,
|
2020-03-12 10:16:56 +01:00
|
|
|
|
GC_ARG_TYPE_LDAP_SERVER },
|
|
|
|
|
{ "compliance", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT },
|
|
|
|
|
{ "debug-level", GC_OPT_FLAG_ARG_OPT, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "log-file", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
|
|
|
|
GC_ARG_TYPE_FILENAME },
|
|
|
|
|
{ "faked-system-time", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
|
|
|
|
{ "disable-crl-checks", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "enable-crl-checks", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
|
|
|
|
{ "enable-ocsp", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "include-certs", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT },
|
|
|
|
|
{ "disable-policy-checks", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "auto-issuer-key-retrieve", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "cipher-algo", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "disable-trusted-cert-crl-check", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT },
|
|
|
|
|
|
2021-03-23 12:16:37 +01:00
|
|
|
|
/* Pseudo option follows. See also table below. */
|
|
|
|
|
{ "default_pubkey_algo", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
2004-01-31 14:58:27 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
{ NULL }
|
|
|
|
|
};
|
2021-03-23 12:16:37 +01:00
|
|
|
|
static const char *known_pseudo_options_gpgsm[] =
|
|
|
|
|
{/* v-- ARGPARSE_TYPE_STRING */
|
|
|
|
|
"default_pubkey_algo:0:2:@:",
|
|
|
|
|
NULL
|
|
|
|
|
};
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2004-02-24 15:31:59 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The known options of the GC_COMPONENT_DIRMNGR component. */
|
|
|
|
|
static known_option_t known_options_dirmngr[] =
|
|
|
|
|
{
|
|
|
|
|
{ "verbose", GC_OPT_FLAG_LIST, GC_LEVEL_BASIC },
|
|
|
|
|
{ "quiet", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "no-greeting", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
|
|
|
|
{ "resolver-timeout", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
|
|
|
|
{ "nameserver", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
|
|
|
|
{ "debug-level", GC_OPT_FLAG_ARG_OPT, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "log-file", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
|
|
|
|
GC_ARG_TYPE_FILENAME },
|
|
|
|
|
{ "faked-system-time", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
|
|
|
|
{ "batch", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "force", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "use-tor", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "keyserver", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
2022-01-25 20:22:46 +01:00
|
|
|
|
{ "ldapserver", GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
|
|
|
|
|
GC_ARG_TYPE_LDAP_SERVER },
|
2020-03-12 10:16:56 +01:00
|
|
|
|
{ "disable-http", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "ignore-http-dp", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "http-proxy", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "honor-http-proxy", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "disable-ldap", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "ignore-ldap-dp", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "ldap-proxy", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "only-ldap-proxy", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
|
2020-10-05 17:24:57 +02:00
|
|
|
|
{ "add-servers", GC_OPT_FLAG_NONE, GC_LEVEL_EXPERT },
|
2020-03-12 10:16:56 +01:00
|
|
|
|
{ "ldaptimeout", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "max-replies", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "allow-ocsp", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "ocsp-responder", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "ocsp-signer", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
|
|
|
|
|
{ "allow-version-check", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "ignore-ocsp-service-url", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED },
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{ NULL }
|
|
|
|
|
};
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2020-09-23 12:02:50 +02:00
|
|
|
|
/* The known options of the GC_COMPONENT_KEYBOXD component. */
|
|
|
|
|
static known_option_t known_options_keyboxd[] =
|
|
|
|
|
{
|
|
|
|
|
{ "verbose", GC_OPT_FLAG_LIST, GC_LEVEL_BASIC },
|
|
|
|
|
{ "quiet", GC_OPT_FLAG_NONE, GC_LEVEL_BASIC },
|
|
|
|
|
{ "log-file", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED,
|
|
|
|
|
GC_ARG_TYPE_FILENAME },
|
|
|
|
|
{ "faked-system-time", GC_OPT_FLAG_NONE, GC_LEVEL_INVISIBLE },
|
|
|
|
|
|
|
|
|
|
{ NULL }
|
|
|
|
|
};
|
|
|
|
|
|
2004-02-25 21:24:53 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The known options of the GC_COMPONENT_PINENTRY component. */
|
|
|
|
|
static known_option_t known_options_pinentry[] =
|
|
|
|
|
{
|
|
|
|
|
{ NULL }
|
|
|
|
|
};
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* Our main option info object. We copy all required information from the
|
|
|
|
|
* gpgrt_opt_t items but convert the flags value to bit flags. */
|
|
|
|
|
struct gc_option_s
|
|
|
|
|
{
|
|
|
|
|
const char *name; /* The same as gpgrt_opt_t.long_opt. */
|
|
|
|
|
const char *desc; /* The same as gpgrt_opt_t.description. */
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
unsigned int is_header:1; /* This is a header item. */
|
|
|
|
|
unsigned int is_list:1; /* This is a list style option. */
|
|
|
|
|
unsigned int opt_arg:1; /* The option's argument is optional. */
|
|
|
|
|
unsigned int runtime:1; /* The option is runtime changeable. */
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2020-03-14 18:53:43 +01:00
|
|
|
|
unsigned int gpgconf_list:1; /* Mentioned by --gpgconf-list. */
|
2004-02-18 18:00:56 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
unsigned int has_default:1; /* The option has a default value. */
|
2024-05-13 00:09:23 +02:00
|
|
|
|
unsigned int def_in_desc:1; /* The default is in the description. */
|
2020-03-12 10:16:56 +01:00
|
|
|
|
unsigned int no_arg_desc:1; /* The argument has a default ???. */
|
|
|
|
|
unsigned int no_change:1; /* User shall not change the option. */
|
2004-03-23 14:04:34 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
unsigned int attr_ignore:1; /* The ARGPARSE_ATTR_IGNORE. */
|
|
|
|
|
unsigned int attr_force:1; /* The ARGPARSE_ATTR_FORCE. */
|
2004-03-23 14:04:34 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The expert level - copied from known_options. */
|
|
|
|
|
gc_expert_level_t level;
|
2004-02-18 18:00:56 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The complex type - copied from known_options. */
|
|
|
|
|
gc_arg_type_t arg_type;
|
2004-02-18 18:00:56 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The default value for this option. This is NULL if the option is
|
|
|
|
|
not present in the component, the empty string if no default is
|
|
|
|
|
available, and otherwise a quoted string. This is currently
|
|
|
|
|
malloced.*/
|
|
|
|
|
char *default_value;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The current value of this option. */
|
|
|
|
|
char *value;
|
2010-08-19 11:53:55 +02:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The new flags for this option. The only defined flag is actually
|
|
|
|
|
GC_OPT_FLAG_DEFAULT, and it means that the option should be
|
|
|
|
|
deleted. In this case, NEW_VALUE is NULL. */
|
|
|
|
|
unsigned long new_flags;
|
2010-08-19 11:53:55 +02:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The new value of this option. */
|
|
|
|
|
char *new_value;
|
|
|
|
|
};
|
|
|
|
|
typedef struct gc_option_s gc_option_t;
|
2010-08-19 11:53:55 +02:00
|
|
|
|
|
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
|
|
|
|
/* The information associated with each component. */
|
2020-03-12 10:16:56 +01:00
|
|
|
|
static struct
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The name of the component. Some components don't have an
|
|
|
|
|
* associated program, but are implemented directly by GPGConf. In
|
|
|
|
|
* this case, PROGRAM is NULL. */
|
|
|
|
|
char *program;
|
|
|
|
|
|
|
|
|
|
/* The displayed name of this component. Must not contain a colon
|
|
|
|
|
* (':') character. */
|
2004-01-29 00:58:18 +01:00
|
|
|
|
const char *name;
|
|
|
|
|
|
|
|
|
|
/* The gettext domain for the description DESC. If this is NULL,
|
|
|
|
|
then the description is not translated. */
|
|
|
|
|
const char *desc_domain;
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The description of this component. */
|
2004-01-29 00:58:18 +01:00
|
|
|
|
const char *desc;
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The module name (GNUPG_MODULE_NAME_foo) as defined by
|
|
|
|
|
* ../common/util.h. This value is used to get the actual installed
|
|
|
|
|
* path of the program. 0 is used if no program for the component
|
|
|
|
|
* is available. */
|
|
|
|
|
char module_name;
|
|
|
|
|
|
|
|
|
|
/* The name for the configuration filename of this component. */
|
|
|
|
|
const char *option_config_filename;
|
|
|
|
|
|
|
|
|
|
/* The static table of known options for this component. */
|
|
|
|
|
known_option_t *known_options;
|
|
|
|
|
|
2021-03-23 12:16:37 +01:00
|
|
|
|
/* The static table of known pseudo options for this component or NULL. */
|
|
|
|
|
const char **known_pseudo_options;
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The runtime change callback. If KILLFLAG is true the component
|
|
|
|
|
is killed and not just reloaded. */
|
|
|
|
|
void (*runtime_change) (int killflag);
|
|
|
|
|
|
|
|
|
|
/* The table of known options as read from the component including
|
|
|
|
|
* header lines and such. This is suitable to be passed to
|
|
|
|
|
* gpgrt_argparser. Will be filled in by
|
|
|
|
|
* retrieve_options_from_program. */
|
|
|
|
|
gpgrt_opt_t *opt_table;
|
|
|
|
|
|
|
|
|
|
/* The full table including data from OPT_TABLE. The end of the
|
|
|
|
|
* table is marked by NULL entry for NAME. Will be filled in by
|
|
|
|
|
* retrieve_options_from_program. */
|
2004-01-29 00:58:18 +01:00
|
|
|
|
gc_option_t *options;
|
2020-03-12 10:16:56 +01:00
|
|
|
|
|
|
|
|
|
} gc_component[GC_COMPONENT_NR] =
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2020-06-24 12:33:26 +02:00
|
|
|
|
/* Note: The order of the items must match the order given in the
|
|
|
|
|
* gc_component_id_t enumeration. The order is often used by
|
|
|
|
|
* frontends to display the backend options thus do not change the
|
|
|
|
|
* order without considering the user experience. */
|
2020-03-12 10:16:56 +01:00
|
|
|
|
{ NULL }, /* DUMMY for GC_COMPONENT_ANY */
|
|
|
|
|
|
|
|
|
|
{ GPG_NAME, GPG_DISP_NAME, "gnupg", N_("OpenPGP"),
|
|
|
|
|
GNUPG_MODULE_NAME_GPG, GPG_NAME ".conf",
|
2021-03-23 12:16:37 +01:00
|
|
|
|
known_options_gpg, known_pseudo_options_gpg },
|
2020-03-12 10:16:56 +01:00
|
|
|
|
|
|
|
|
|
{ GPGSM_NAME, GPGSM_DISP_NAME, "gnupg", N_("S/MIME"),
|
|
|
|
|
GNUPG_MODULE_NAME_GPGSM, GPGSM_NAME ".conf",
|
2021-03-23 12:16:37 +01:00
|
|
|
|
known_options_gpgsm, known_pseudo_options_gpgsm },
|
2020-03-12 10:16:56 +01:00
|
|
|
|
|
2020-09-23 12:02:50 +02:00
|
|
|
|
{ KEYBOXD_NAME, KEYBOXD_DISP_NAME, "gnupg", N_("Public Keys"),
|
|
|
|
|
GNUPG_MODULE_NAME_KEYBOXD, KEYBOXD_NAME ".conf",
|
2021-03-23 12:16:37 +01:00
|
|
|
|
known_options_keyboxd, NULL, keyboxd_runtime_change },
|
2020-09-23 12:02:50 +02:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
{ GPG_AGENT_NAME, GPG_AGENT_DISP_NAME, "gnupg", N_("Private Keys"),
|
|
|
|
|
GNUPG_MODULE_NAME_AGENT, GPG_AGENT_NAME ".conf",
|
2021-03-23 12:16:37 +01:00
|
|
|
|
known_options_gpg_agent, NULL, gpg_agent_runtime_change },
|
2020-03-12 10:16:56 +01:00
|
|
|
|
|
|
|
|
|
{ SCDAEMON_NAME, SCDAEMON_DISP_NAME, "gnupg", N_("Smartcards"),
|
|
|
|
|
GNUPG_MODULE_NAME_SCDAEMON, SCDAEMON_NAME ".conf",
|
2021-03-23 12:16:37 +01:00
|
|
|
|
known_options_scdaemon, NULL, scdaemon_runtime_change},
|
2020-03-12 10:16:56 +01:00
|
|
|
|
|
2021-04-23 04:10:04 +02:00
|
|
|
|
#ifdef BUILD_WITH_TPM2D
|
2021-03-09 22:50:28 +01:00
|
|
|
|
{ TPM2DAEMON_NAME, TPM2DAEMON_DISP_NAME, "gnupg", N_("TPM"),
|
|
|
|
|
GNUPG_MODULE_NAME_TPM2DAEMON, TPM2DAEMON_NAME ".conf",
|
2021-03-23 12:16:37 +01:00
|
|
|
|
known_options_tpm2daemon, NULL, tpm2daemon_runtime_change},
|
2022-03-25 06:25:20 +01:00
|
|
|
|
#else
|
|
|
|
|
{ NULL }, /* DUMMY to keep the table in-sync with enums */
|
2021-04-23 04:10:04 +02:00
|
|
|
|
#endif
|
2021-03-09 22:50:28 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
{ DIRMNGR_NAME, DIRMNGR_DISP_NAME, "gnupg", N_("Network"),
|
|
|
|
|
GNUPG_MODULE_NAME_DIRMNGR, DIRMNGR_NAME ".conf",
|
2021-03-23 12:16:37 +01:00
|
|
|
|
known_options_dirmngr, NULL, dirmngr_runtime_change },
|
2020-03-12 10:16:56 +01:00
|
|
|
|
|
|
|
|
|
{ "pinentry", "Pinentry", "gnupg", N_("Passphrase Entry"),
|
|
|
|
|
GNUPG_MODULE_NAME_PINENTRY, NULL,
|
|
|
|
|
known_options_pinentry }
|
2004-01-29 00:58:18 +01:00
|
|
|
|
};
|
|
|
|
|
|
2007-08-29 18:59:20 +02:00
|
|
|
|
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* Structure used to collect error output of the component programs. */
|
2007-08-29 18:59:20 +02:00
|
|
|
|
struct error_line_s;
|
|
|
|
|
typedef struct error_line_s *error_line_t;
|
|
|
|
|
struct error_line_s
|
|
|
|
|
{
|
|
|
|
|
error_line_t next; /* Link to next item. */
|
|
|
|
|
const char *fname; /* Name of the config file (points into BUFFER). */
|
|
|
|
|
unsigned int lineno; /* Line number of the config file. */
|
|
|
|
|
const char *errtext; /* Text of the error message (points into BUFFER). */
|
|
|
|
|
char buffer[1]; /* Helper buffer. */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
2004-03-23 13:21:48 +01:00
|
|
|
|
|
2017-01-10 15:42:27 +01:00
|
|
|
|
|
|
|
|
|
/* Initialization and finalization. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
gc_option_free (gc_option_t *o)
|
|
|
|
|
{
|
|
|
|
|
if (o == NULL || o->name == NULL)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
xfree (o->value);
|
|
|
|
|
gc_option_free (o + 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
gc_components_free (void)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
for (i = 0; i < DIM (gc_component); i++)
|
|
|
|
|
gc_option_free (gc_component[i].options);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
gc_components_init (void)
|
|
|
|
|
{
|
|
|
|
|
atexit (gc_components_free);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-03-23 13:21:48 +01:00
|
|
|
|
/* Engine specific support. */
|
2009-02-27 15:36:59 +01:00
|
|
|
|
static void
|
2011-02-23 10:15:34 +01:00
|
|
|
|
gpg_agent_runtime_change (int killflag)
|
2004-03-23 13:21:48 +01:00
|
|
|
|
{
|
2016-10-17 04:36:45 +02:00
|
|
|
|
gpg_error_t err = 0;
|
2008-05-26 14:00:55 +02:00
|
|
|
|
const char *pgmname;
|
2016-10-17 04:36:45 +02:00
|
|
|
|
const char *argv[5];
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_t proc = NULL;
|
2016-10-17 04:36:45 +02:00
|
|
|
|
int i = 0;
|
2021-03-26 14:44:17 +01:00
|
|
|
|
int cmdidx;
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2008-05-26 14:00:55 +02:00
|
|
|
|
pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CONNECT_AGENT);
|
2016-10-17 04:36:45 +02:00
|
|
|
|
if (!gnupg_default_homedir_p ())
|
|
|
|
|
{
|
|
|
|
|
argv[i++] = "--homedir";
|
2019-05-15 08:50:15 +02:00
|
|
|
|
argv[i++] = gnupg_homedir ();
|
2016-10-17 04:36:45 +02:00
|
|
|
|
}
|
|
|
|
|
argv[i++] = "--no-autostart";
|
2021-03-26 14:44:17 +01:00
|
|
|
|
cmdidx = i;
|
2016-10-17 04:36:45 +02:00
|
|
|
|
argv[i++] = killflag? "KILLAGENT" : "RELOADAGENT";
|
2021-03-26 14:44:17 +01:00
|
|
|
|
argv[i] = NULL;
|
|
|
|
|
log_assert (i < DIM(argv));
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2016-10-17 04:36:45 +02:00
|
|
|
|
if (!err)
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
err = gpgrt_process_spawn (pgmname, argv, 0, NULL, &proc);
|
2008-05-26 14:00:55 +02:00
|
|
|
|
if (!err)
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
err = gpgrt_process_wait (proc, 1);
|
2008-05-26 14:00:55 +02:00
|
|
|
|
if (err)
|
2014-11-19 10:31:34 +01:00
|
|
|
|
gc_error (0, 0, "error running '%s %s': %s",
|
2021-03-26 14:44:17 +01:00
|
|
|
|
pgmname, argv[cmdidx], gpg_strerror (err));
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_release (proc);
|
2004-03-23 13:21:48 +01:00
|
|
|
|
}
|
|
|
|
|
|
2008-05-26 14:00:55 +02:00
|
|
|
|
|
2009-02-27 15:36:59 +01:00
|
|
|
|
static void
|
2011-02-23 10:15:34 +01:00
|
|
|
|
scdaemon_runtime_change (int killflag)
|
2009-02-27 15:36:59 +01:00
|
|
|
|
{
|
2016-10-17 04:36:45 +02:00
|
|
|
|
gpg_error_t err = 0;
|
2009-02-27 15:36:59 +01:00
|
|
|
|
const char *pgmname;
|
2016-10-17 04:36:45 +02:00
|
|
|
|
const char *argv[9];
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_t proc = NULL;
|
2016-10-17 04:36:45 +02:00
|
|
|
|
int i = 0;
|
2021-03-26 14:44:17 +01:00
|
|
|
|
int cmdidx;
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
|
|
|
|
(void)killflag; /* For scdaemon kill and reload are synonyms. */
|
|
|
|
|
|
2009-03-03 10:02:58 +01:00
|
|
|
|
/* We use "GETINFO app_running" to see whether the agent is already
|
|
|
|
|
running and kill it only in this case. This avoids an explicit
|
|
|
|
|
starting of the agent in case it is not yet running. There is
|
|
|
|
|
obviously a race condition but that should not harm too much. */
|
|
|
|
|
|
2009-02-27 15:36:59 +01:00
|
|
|
|
pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CONNECT_AGENT);
|
2016-10-17 04:36:45 +02:00
|
|
|
|
if (!gnupg_default_homedir_p ())
|
|
|
|
|
{
|
|
|
|
|
argv[i++] = "--homedir";
|
2019-05-15 08:50:15 +02:00
|
|
|
|
argv[i++] = gnupg_homedir ();
|
2016-10-17 04:36:45 +02:00
|
|
|
|
}
|
|
|
|
|
argv[i++] = "-s";
|
|
|
|
|
argv[i++] = "--no-autostart";
|
|
|
|
|
argv[i++] = "GETINFO scd_running";
|
|
|
|
|
argv[i++] = "/if ${! $?}";
|
2021-03-26 14:44:17 +01:00
|
|
|
|
cmdidx = i;
|
2016-10-17 04:36:45 +02:00
|
|
|
|
argv[i++] = "scd killscd";
|
|
|
|
|
argv[i++] = "/end";
|
2021-03-26 14:44:17 +01:00
|
|
|
|
argv[i] = NULL;
|
|
|
|
|
log_assert (i < DIM(argv));
|
2016-10-17 04:36:45 +02:00
|
|
|
|
|
|
|
|
|
if (!err)
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
err = gpgrt_process_spawn (pgmname, argv, 0, NULL, &proc);
|
2014-11-19 10:31:34 +01:00
|
|
|
|
if (!err)
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
err = gpgrt_process_wait (proc, 1);
|
2014-11-19 10:31:34 +01:00
|
|
|
|
if (err)
|
|
|
|
|
gc_error (0, 0, "error running '%s %s': %s",
|
2021-03-26 14:44:17 +01:00
|
|
|
|
pgmname, argv[cmdidx], gpg_strerror (err));
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_release (proc);
|
2014-11-19 10:31:34 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2021-04-23 04:10:04 +02:00
|
|
|
|
#ifdef BUILD_WITH_TPM2D
|
2021-03-09 22:50:28 +01:00
|
|
|
|
static void
|
|
|
|
|
tpm2daemon_runtime_change (int killflag)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err = 0;
|
|
|
|
|
const char *pgmname;
|
|
|
|
|
const char *argv[9];
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_t proc = NULL;
|
2021-03-09 22:50:28 +01:00
|
|
|
|
int i = 0;
|
2021-03-26 14:44:17 +01:00
|
|
|
|
int cmdidx;
|
2021-03-09 22:50:28 +01:00
|
|
|
|
|
|
|
|
|
(void)killflag; /* For scdaemon kill and reload are synonyms. */
|
|
|
|
|
|
|
|
|
|
/* We use "GETINFO app_running" to see whether the agent is already
|
|
|
|
|
running and kill it only in this case. This avoids an explicit
|
|
|
|
|
starting of the agent in case it is not yet running. There is
|
|
|
|
|
obviously a race condition but that should not harm too much. */
|
|
|
|
|
|
|
|
|
|
pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CONNECT_AGENT);
|
|
|
|
|
if (!gnupg_default_homedir_p ())
|
|
|
|
|
{
|
|
|
|
|
argv[i++] = "--homedir";
|
|
|
|
|
argv[i++] = gnupg_homedir ();
|
|
|
|
|
}
|
|
|
|
|
argv[i++] = "-s";
|
|
|
|
|
argv[i++] = "--no-autostart";
|
|
|
|
|
argv[i++] = "GETINFO tpm2d_running";
|
|
|
|
|
argv[i++] = "/if ${! $?}";
|
2021-03-26 14:44:17 +01:00
|
|
|
|
cmdidx = i;
|
2021-03-09 22:50:28 +01:00
|
|
|
|
argv[i++] = "scd killtpm2cd";
|
|
|
|
|
argv[i++] = "/end";
|
2021-03-26 14:44:17 +01:00
|
|
|
|
argv[i] = NULL;
|
|
|
|
|
log_assert (i < DIM(argv));
|
2021-03-09 22:50:28 +01:00
|
|
|
|
|
|
|
|
|
if (!err)
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
err = gpgrt_process_spawn (pgmname, argv, 0, NULL, &proc);
|
2021-03-09 22:50:28 +01:00
|
|
|
|
if (!err)
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
err = gpgrt_process_wait (proc, 1);
|
2021-03-09 22:50:28 +01:00
|
|
|
|
if (err)
|
|
|
|
|
gc_error (0, 0, "error running '%s %s': %s",
|
2021-03-26 14:44:17 +01:00
|
|
|
|
pgmname, argv[cmdidx], gpg_strerror (err));
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_release (proc);
|
2021-03-09 22:50:28 +01:00
|
|
|
|
}
|
2021-04-23 04:10:04 +02:00
|
|
|
|
#endif
|
2021-03-09 22:50:28 +01:00
|
|
|
|
|
|
|
|
|
|
2014-11-19 10:31:34 +01:00
|
|
|
|
static void
|
|
|
|
|
dirmngr_runtime_change (int killflag)
|
|
|
|
|
{
|
2016-10-17 04:36:45 +02:00
|
|
|
|
gpg_error_t err = 0;
|
2014-11-19 10:31:34 +01:00
|
|
|
|
const char *pgmname;
|
2016-10-17 04:36:45 +02:00
|
|
|
|
const char *argv[6];
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_t proc = NULL;
|
2021-03-26 14:44:17 +01:00
|
|
|
|
int i = 0;
|
|
|
|
|
int cmdidx;
|
2014-11-19 10:31:34 +01:00
|
|
|
|
|
|
|
|
|
pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CONNECT_AGENT);
|
2021-03-26 14:44:17 +01:00
|
|
|
|
if (!gnupg_default_homedir_p ())
|
2016-10-17 04:36:45 +02:00
|
|
|
|
{
|
2021-03-26 14:44:17 +01:00
|
|
|
|
argv[i++] = "--homedir";
|
|
|
|
|
argv[i++] = gnupg_homedir ();
|
2016-10-17 04:36:45 +02:00
|
|
|
|
}
|
2021-05-28 19:48:16 +02:00
|
|
|
|
argv[i++] = "--no-autostart";
|
|
|
|
|
argv[i++] = "--dirmngr";
|
|
|
|
|
cmdidx = i;
|
|
|
|
|
argv[i++] = killflag? "KILLDIRMNGR" : "RELOADDIRMNGR";
|
2021-03-26 14:44:17 +01:00
|
|
|
|
argv[i] = NULL;
|
|
|
|
|
log_assert (i < DIM(argv));
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2016-10-17 04:36:45 +02:00
|
|
|
|
if (!err)
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
err = gpgrt_process_spawn (pgmname, argv, 0, NULL, &proc);
|
2009-02-27 15:36:59 +01:00
|
|
|
|
if (!err)
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
err = gpgrt_process_wait (proc, 1);
|
2009-02-27 15:36:59 +01:00
|
|
|
|
if (err)
|
2014-11-19 10:31:34 +01:00
|
|
|
|
gc_error (0, 0, "error running '%s %s': %s",
|
2021-03-26 14:44:17 +01:00
|
|
|
|
pgmname, argv[cmdidx], gpg_strerror (err));
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_release (proc);
|
2009-02-27 15:36:59 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2020-09-23 12:02:50 +02:00
|
|
|
|
static void
|
|
|
|
|
keyboxd_runtime_change (int killflag)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err = 0;
|
|
|
|
|
const char *pgmname;
|
|
|
|
|
const char *argv[6];
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_t proc = NULL;
|
2021-03-26 14:44:17 +01:00
|
|
|
|
int i = 0;
|
|
|
|
|
int cmdidx;
|
2020-09-23 12:02:50 +02:00
|
|
|
|
|
|
|
|
|
pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CONNECT_AGENT);
|
2021-03-26 14:44:17 +01:00
|
|
|
|
argv[i++] = "--no-autostart";
|
|
|
|
|
argv[i++] = "--keyboxd";
|
|
|
|
|
cmdidx = i;
|
|
|
|
|
argv[i++] = killflag? "KILLKEYBOXD" : "RELOADKEYBOXD";
|
|
|
|
|
if (!gnupg_default_homedir_p ())
|
2020-09-23 12:02:50 +02:00
|
|
|
|
{
|
2021-03-26 14:44:17 +01:00
|
|
|
|
argv[i++] = "--homedir";
|
|
|
|
|
argv[i++] = gnupg_homedir ();
|
2020-09-23 12:02:50 +02:00
|
|
|
|
}
|
2021-03-26 14:44:17 +01:00
|
|
|
|
argv[i] = NULL;
|
|
|
|
|
log_assert (i < DIM(argv));
|
2020-09-23 12:02:50 +02:00
|
|
|
|
|
|
|
|
|
if (!err)
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
err = gpgrt_process_spawn (pgmname, argv, 0, NULL, &proc);
|
2020-09-23 12:02:50 +02:00
|
|
|
|
if (!err)
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
err = gpgrt_process_wait (proc, 1);
|
2020-09-23 12:02:50 +02:00
|
|
|
|
if (err)
|
|
|
|
|
gc_error (0, 0, "error running '%s %s': %s",
|
2021-03-26 14:44:17 +01:00
|
|
|
|
pgmname, argv[cmdidx], gpg_strerror (err));
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_release (proc);
|
2020-09-23 12:02:50 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2014-04-08 15:55:51 +02:00
|
|
|
|
/* Launch the gpg-agent or the dirmngr if not already running. */
|
2014-12-17 10:36:24 +01:00
|
|
|
|
gpg_error_t
|
2014-04-08 15:55:51 +02:00
|
|
|
|
gc_component_launch (int component)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
const char *pgmname;
|
2021-03-26 14:44:17 +01:00
|
|
|
|
const char *argv[6];
|
2014-04-08 15:55:51 +02:00
|
|
|
|
int i;
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_t proc = NULL;
|
2014-04-08 15:55:51 +02:00
|
|
|
|
|
2017-01-18 10:01:55 +01:00
|
|
|
|
if (component < 0)
|
|
|
|
|
{
|
|
|
|
|
err = gc_component_launch (GC_COMPONENT_GPG_AGENT);
|
2020-09-23 12:02:50 +02:00
|
|
|
|
if (!err)
|
|
|
|
|
err = gc_component_launch (GC_COMPONENT_KEYBOXD);
|
2017-01-18 10:01:55 +01:00
|
|
|
|
if (!err)
|
|
|
|
|
err = gc_component_launch (GC_COMPONENT_DIRMNGR);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-08 15:55:51 +02:00
|
|
|
|
if (!(component == GC_COMPONENT_GPG_AGENT
|
2020-09-23 12:02:50 +02:00
|
|
|
|
|| component == GC_COMPONENT_KEYBOXD
|
2014-04-08 15:55:51 +02:00
|
|
|
|
|| component == GC_COMPONENT_DIRMNGR))
|
|
|
|
|
{
|
2019-05-16 12:24:08 +02:00
|
|
|
|
log_error ("%s\n", _("Component not suitable for launching"));
|
|
|
|
|
gpgconf_failure (0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (gc_component_check_options (component, NULL, NULL))
|
|
|
|
|
{
|
|
|
|
|
log_error (_("Configuration file of component %s is broken\n"),
|
|
|
|
|
gc_component[component].name);
|
|
|
|
|
if (!opt.quiet)
|
|
|
|
|
log_info (_("Note: Use the command \"%s%s\" to get details.\n"),
|
2021-04-20 10:27:04 +02:00
|
|
|
|
gc_component[component].program
|
|
|
|
|
? gc_component[component].program
|
|
|
|
|
: gc_component[component].name,
|
|
|
|
|
" --gpgconf-test");
|
2017-12-18 17:46:05 +01:00
|
|
|
|
gpgconf_failure (0);
|
2014-04-08 15:55:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CONNECT_AGENT);
|
|
|
|
|
i = 0;
|
2019-05-15 08:50:15 +02:00
|
|
|
|
if (!gnupg_default_homedir_p ())
|
|
|
|
|
{
|
|
|
|
|
argv[i++] = "--homedir";
|
|
|
|
|
argv[i++] = gnupg_homedir ();
|
|
|
|
|
}
|
2014-04-08 15:55:51 +02:00
|
|
|
|
if (component == GC_COMPONENT_DIRMNGR)
|
|
|
|
|
argv[i++] = "--dirmngr";
|
2020-09-23 12:02:50 +02:00
|
|
|
|
else if (component == GC_COMPONENT_KEYBOXD)
|
|
|
|
|
argv[i++] = "--keyboxd";
|
2014-04-08 15:55:51 +02:00
|
|
|
|
argv[i++] = "NOP";
|
|
|
|
|
argv[i] = NULL;
|
2021-03-26 14:44:17 +01:00
|
|
|
|
log_assert (i < DIM(argv));
|
2014-04-08 15:55:51 +02:00
|
|
|
|
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
err = gpgrt_process_spawn (pgmname, argv, 0, NULL, &proc);
|
2014-04-08 15:55:51 +02:00
|
|
|
|
if (!err)
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
err = gpgrt_process_wait (proc, 1);
|
2014-04-08 15:55:51 +02:00
|
|
|
|
if (err)
|
|
|
|
|
gc_error (0, 0, "error running '%s%s%s': %s",
|
|
|
|
|
pgmname,
|
2020-09-23 12:02:50 +02:00
|
|
|
|
component == GC_COMPONENT_DIRMNGR? " --dirmngr"
|
|
|
|
|
: component == GC_COMPONENT_KEYBOXD? " --keyboxd":"",
|
2014-04-08 15:55:51 +02:00
|
|
|
|
" NOP",
|
|
|
|
|
gpg_strerror (err));
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_release (proc);
|
2014-12-17 10:36:24 +01:00
|
|
|
|
return err;
|
2014-04-08 15:55:51 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
static void
|
|
|
|
|
do_runtime_change (int component, int killflag)
|
2011-02-23 10:15:34 +01:00
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
int runtime[GC_COMPONENT_NR] = { 0 };
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2017-01-18 10:01:55 +01:00
|
|
|
|
if (component < 0)
|
|
|
|
|
{
|
|
|
|
|
for (component = 0; component < GC_COMPONENT_NR; component++)
|
2020-03-12 10:16:56 +01:00
|
|
|
|
runtime [component] = 1;
|
2017-01-18 10:01:55 +01:00
|
|
|
|
}
|
|
|
|
|
else
|
2011-02-23 10:15:34 +01:00
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
log_assert (component >= 0 && component < GC_COMPONENT_NR);
|
|
|
|
|
runtime [component] = 1;
|
2011-02-23 10:15:34 +01:00
|
|
|
|
}
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* Do the restart for the selected components. */
|
|
|
|
|
for (component = GC_COMPONENT_NR-1; component >= 0; component--)
|
2011-02-23 10:15:34 +01:00
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (runtime[component] && gc_component[component].runtime_change)
|
|
|
|
|
(*gc_component[component].runtime_change) (killflag);
|
2011-02-23 10:15:34 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* Unconditionally restart COMPONENT. */
|
2009-03-03 10:02:58 +01:00
|
|
|
|
void
|
2020-03-12 10:16:56 +01:00
|
|
|
|
gc_component_kill (int component)
|
2009-03-03 10:02:58 +01:00
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
do_runtime_change (component, 1);
|
|
|
|
|
}
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2009-03-03 10:02:58 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* Unconditionally reload COMPONENT or all components if COMPONENT is -1. */
|
|
|
|
|
void
|
|
|
|
|
gc_component_reload (int component)
|
|
|
|
|
{
|
|
|
|
|
do_runtime_change (component, 0);
|
2009-03-03 10:02:58 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2004-09-29 18:16:47 +02:00
|
|
|
|
/* More or less Robust version of dgettext. It has the side effect of
|
|
|
|
|
switching the codeset to utf-8 because this is what we want to
|
2017-04-28 03:06:33 +02:00
|
|
|
|
output. In theory it is possible to keep the original code set and
|
Spelling cleanup.
No functional changes, just fixing minor spelling issues.
---
Most of these were identified from the command line by running:
codespell \
--ignore-words-list fpr,stati,keyserver,keyservers,asign,cas,iff,ifset \
--skip '*.po,ChangeLog*,help.*.txt,*.jpg,*.eps,*.pdf,*.png,*.gpg,*.asc' \
doc g13 g10 kbx agent artwork scd tests tools am common dirmngr sm \
NEWS README README.maint TODO
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
2020-02-18 15:34:42 +01:00
|
|
|
|
switch back for regular diagnostic output (redefine "_(" for that)
|
|
|
|
|
but given the nature of this tool, being something invoked from
|
|
|
|
|
other programs, it does not make much sense. */
|
2004-01-29 00:58:18 +01:00
|
|
|
|
static const char *
|
|
|
|
|
my_dgettext (const char *domain, const char *msgid)
|
|
|
|
|
{
|
2021-03-28 10:38:42 +02:00
|
|
|
|
if (!msgid || !*msgid)
|
|
|
|
|
return msgid; /* Shortcut form "" which has the PO files meta data. */
|
|
|
|
|
|
2008-05-09 11:54:35 +02:00
|
|
|
|
#ifdef USE_SIMPLE_GETTEXT
|
|
|
|
|
if (domain)
|
|
|
|
|
{
|
|
|
|
|
static int switched_codeset;
|
|
|
|
|
char *text;
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2008-05-09 11:54:35 +02:00
|
|
|
|
if (!switched_codeset)
|
|
|
|
|
{
|
|
|
|
|
switched_codeset = 1;
|
2010-03-15 14:08:51 +01:00
|
|
|
|
gettext_use_utf8 (1);
|
2008-05-09 11:54:35 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!strcmp (domain, "gnupg"))
|
|
|
|
|
domain = PACKAGE_GT;
|
|
|
|
|
|
|
|
|
|
/* FIXME: we have no dgettext, thus we can't switch. */
|
|
|
|
|
|
2009-04-01 12:51:53 +02:00
|
|
|
|
text = (char*)gettext (msgid);
|
2008-05-09 11:54:35 +02:00
|
|
|
|
return text ? text : msgid;
|
|
|
|
|
}
|
2014-03-07 09:46:44 +01:00
|
|
|
|
else
|
|
|
|
|
return msgid;
|
2008-05-09 11:54:35 +02:00
|
|
|
|
#elif defined(ENABLE_NLS)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
if (domain)
|
|
|
|
|
{
|
2004-04-07 18:53:55 +02:00
|
|
|
|
static int switched_codeset;
|
|
|
|
|
char *text;
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2004-04-07 18:53:55 +02:00
|
|
|
|
if (!switched_codeset)
|
|
|
|
|
{
|
|
|
|
|
switched_codeset = 1;
|
2004-10-01 14:53:09 +02:00
|
|
|
|
bind_textdomain_codeset (PACKAGE_GT, "utf-8");
|
|
|
|
|
|
2021-10-06 13:19:39 +02:00
|
|
|
|
bindtextdomain (DIRMNGR_NAME, gnupg_localedir ());
|
2013-11-18 14:09:47 +01:00
|
|
|
|
bind_textdomain_codeset (DIRMNGR_NAME, "utf-8");
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2004-04-07 18:53:55 +02:00
|
|
|
|
}
|
2004-09-29 18:16:47 +02:00
|
|
|
|
|
|
|
|
|
/* Note: This is a hack to actually use the gnupg2 domain as
|
|
|
|
|
long we are in a transition phase where gnupg 1.x and 1.9 may
|
|
|
|
|
coexist. */
|
|
|
|
|
if (!strcmp (domain, "gnupg"))
|
|
|
|
|
domain = PACKAGE_GT;
|
|
|
|
|
|
2004-04-07 18:53:55 +02:00
|
|
|
|
text = dgettext (domain, msgid);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
return text ? text : msgid;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return msgid;
|
2014-02-10 19:48:42 +01:00
|
|
|
|
#else
|
|
|
|
|
(void)domain;
|
|
|
|
|
return msgid;
|
|
|
|
|
#endif
|
2004-01-29 00:58:18 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Percent-Escape special characters. The string is valid until the
|
|
|
|
|
next invocation of the function. */
|
2008-05-26 15:43:20 +02:00
|
|
|
|
char *
|
|
|
|
|
gc_percent_escape (const char *src)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
|
|
|
|
static char *esc_str;
|
|
|
|
|
static int esc_str_len;
|
|
|
|
|
int new_len = 3 * strlen (src) + 1;
|
|
|
|
|
char *dst;
|
|
|
|
|
|
|
|
|
|
if (esc_str_len < new_len)
|
|
|
|
|
{
|
2020-03-03 14:17:24 +01:00
|
|
|
|
char *new_esc_str = xrealloc (esc_str, new_len);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
esc_str = new_esc_str;
|
|
|
|
|
esc_str_len = new_len;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dst = esc_str;
|
|
|
|
|
while (*src)
|
|
|
|
|
{
|
|
|
|
|
if (*src == '%')
|
|
|
|
|
{
|
|
|
|
|
*(dst++) = '%';
|
|
|
|
|
*(dst++) = '2';
|
|
|
|
|
*(dst++) = '5';
|
2011-02-23 10:15:34 +01:00
|
|
|
|
}
|
2004-01-29 00:58:18 +01:00
|
|
|
|
else if (*src == ':')
|
|
|
|
|
{
|
|
|
|
|
/* The colon is used as field separator. */
|
|
|
|
|
*(dst++) = '%';
|
|
|
|
|
*(dst++) = '3';
|
|
|
|
|
*(dst++) = 'a';
|
|
|
|
|
}
|
|
|
|
|
else if (*src == ',')
|
|
|
|
|
{
|
|
|
|
|
/* The comma is used as list separator. */
|
|
|
|
|
*(dst++) = '%';
|
|
|
|
|
*(dst++) = '2';
|
|
|
|
|
*(dst++) = 'c';
|
|
|
|
|
}
|
2017-03-01 17:47:47 +01:00
|
|
|
|
else if (*src == '\n')
|
|
|
|
|
{
|
|
|
|
|
/* The newline is problematic in a line-based format. */
|
|
|
|
|
*(dst++) = '%';
|
|
|
|
|
*(dst++) = '0';
|
|
|
|
|
*(dst++) = 'a';
|
|
|
|
|
}
|
2004-01-29 00:58:18 +01:00
|
|
|
|
else
|
|
|
|
|
*(dst++) = *(src);
|
|
|
|
|
src++;
|
|
|
|
|
}
|
|
|
|
|
*dst = '\0';
|
|
|
|
|
return esc_str;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-02-23 20:37:04 +01:00
|
|
|
|
|
|
|
|
|
/* Percent-Deescape special characters. The string is valid until the
|
|
|
|
|
next invocation of the function. */
|
|
|
|
|
static char *
|
|
|
|
|
percent_deescape (const char *src)
|
|
|
|
|
{
|
|
|
|
|
static char *str;
|
|
|
|
|
static int str_len;
|
|
|
|
|
int new_len = 3 * strlen (src) + 1;
|
|
|
|
|
char *dst;
|
|
|
|
|
|
|
|
|
|
if (str_len < new_len)
|
|
|
|
|
{
|
2020-03-03 14:17:24 +01:00
|
|
|
|
char *new_str = xrealloc (str, new_len);
|
2004-02-23 20:37:04 +01:00
|
|
|
|
str = new_str;
|
|
|
|
|
str_len = new_len;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dst = str;
|
|
|
|
|
while (*src)
|
|
|
|
|
{
|
|
|
|
|
if (*src == '%')
|
|
|
|
|
{
|
|
|
|
|
int val = hextobyte (src + 1);
|
|
|
|
|
|
|
|
|
|
if (val < 0)
|
|
|
|
|
gc_error (1, 0, "malformed end of string %s", src);
|
|
|
|
|
|
|
|
|
|
*(dst++) = (char) val;
|
|
|
|
|
src += 3;
|
2011-02-23 10:15:34 +01:00
|
|
|
|
}
|
2004-02-23 20:37:04 +01:00
|
|
|
|
else
|
|
|
|
|
*(dst++) = *(src++);
|
|
|
|
|
}
|
|
|
|
|
*dst = '\0';
|
|
|
|
|
return str;
|
|
|
|
|
}
|
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
|
|
|
|
/* List all components that are available. */
|
|
|
|
|
void
|
2010-08-18 21:25:15 +02:00
|
|
|
|
gc_component_list_components (estream_t out)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
gc_component_id_t component;
|
2007-08-31 10:24:52 +02:00
|
|
|
|
const char *desc;
|
|
|
|
|
const char *pgmname;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2007-08-31 10:24:52 +02:00
|
|
|
|
for (component = 0; component < GC_COMPONENT_NR; component++)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (!gc_component[component].program)
|
|
|
|
|
continue;
|
|
|
|
|
if (gc_component[component].module_name)
|
|
|
|
|
pgmname = gnupg_module_name (gc_component[component].module_name);
|
|
|
|
|
else
|
|
|
|
|
pgmname = "";
|
2007-08-31 10:24:52 +02:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
desc = gc_component[component].desc;
|
|
|
|
|
desc = my_dgettext (gc_component[component].desc_domain, desc);
|
|
|
|
|
es_fprintf (out, "%s:%s:",
|
|
|
|
|
gc_component[component].program, gc_percent_escape (desc));
|
|
|
|
|
es_fprintf (out, "%s\n", gc_percent_escape (pgmname));
|
2004-01-29 00:58:18 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2007-08-29 11:51:37 +02:00
|
|
|
|
|
|
|
|
|
|
2007-08-29 18:59:20 +02:00
|
|
|
|
static int
|
|
|
|
|
all_digits_p (const char *p, size_t len)
|
|
|
|
|
{
|
|
|
|
|
if (!len)
|
|
|
|
|
return 0; /* No. */
|
|
|
|
|
for (; len; len--, p++)
|
|
|
|
|
if (!isascii (*p) || !isdigit (*p))
|
|
|
|
|
return 0; /* No. */
|
|
|
|
|
return 1; /* Yes. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-08-20 14:18:38 +02:00
|
|
|
|
/* Collect all error lines from stream FP. Only lines prefixed with
|
|
|
|
|
TAG are considered. Returns a list of error line items (which may
|
|
|
|
|
be empty). There is no error return. */
|
2007-08-29 18:59:20 +02:00
|
|
|
|
static error_line_t
|
2010-08-20 14:18:38 +02:00
|
|
|
|
collect_error_output (estream_t fp, const char *tag)
|
2007-08-29 18:59:20 +02:00
|
|
|
|
{
|
|
|
|
|
char buffer[1024];
|
|
|
|
|
char *p, *p2, *p3;
|
|
|
|
|
int c, cont_line;
|
|
|
|
|
unsigned int pos;
|
|
|
|
|
error_line_t eitem, errlines, *errlines_tail;
|
|
|
|
|
size_t taglen = strlen (tag);
|
|
|
|
|
|
|
|
|
|
errlines = NULL;
|
|
|
|
|
errlines_tail = &errlines;
|
|
|
|
|
pos = 0;
|
|
|
|
|
cont_line = 0;
|
2010-08-20 14:18:38 +02:00
|
|
|
|
while ((c=es_getc (fp)) != EOF)
|
2007-08-29 18:59:20 +02:00
|
|
|
|
{
|
|
|
|
|
buffer[pos++] = c;
|
|
|
|
|
if (pos >= sizeof buffer - 5 || c == '\n')
|
|
|
|
|
{
|
|
|
|
|
buffer[pos - (c == '\n')] = 0;
|
|
|
|
|
if (cont_line)
|
|
|
|
|
; /*Ignore continuations of previous line. */
|
2011-02-23 10:15:34 +01:00
|
|
|
|
else if (!strncmp (buffer, tag, taglen) && buffer[taglen] == ':')
|
2007-08-29 18:59:20 +02:00
|
|
|
|
{
|
|
|
|
|
/* "gpgsm: foo:4: bla" */
|
|
|
|
|
/* Yep, we are interested in this line. */
|
|
|
|
|
p = buffer + taglen + 1;
|
|
|
|
|
while (*p == ' ' || *p == '\t')
|
|
|
|
|
p++;
|
2010-08-20 14:18:38 +02:00
|
|
|
|
trim_trailing_spaces (p); /* Get rid of extra CRs. */
|
2007-08-29 18:59:20 +02:00
|
|
|
|
if (!*p)
|
|
|
|
|
; /* Empty lines are ignored. */
|
|
|
|
|
else if ( (p2 = strchr (p, ':')) && (p3 = strchr (p2+1, ':'))
|
|
|
|
|
&& all_digits_p (p2+1, p3 - (p2+1)))
|
|
|
|
|
{
|
|
|
|
|
/* Line in standard compiler format. */
|
|
|
|
|
p3++;
|
|
|
|
|
while (*p3 == ' ' || *p3 == '\t')
|
|
|
|
|
p3++;
|
|
|
|
|
eitem = xmalloc (sizeof *eitem + strlen (p));
|
|
|
|
|
eitem->next = NULL;
|
|
|
|
|
strcpy (eitem->buffer, p);
|
|
|
|
|
eitem->fname = eitem->buffer;
|
|
|
|
|
eitem->buffer[p2-p] = 0;
|
|
|
|
|
eitem->errtext = eitem->buffer + (p3 - p);
|
|
|
|
|
/* (we already checked that there are only ascii
|
|
|
|
|
digits followed by a colon) */
|
|
|
|
|
eitem->lineno = 0;
|
|
|
|
|
for (p2++; isdigit (*p2); p2++)
|
|
|
|
|
eitem->lineno = eitem->lineno*10 + (*p2 - '0');
|
|
|
|
|
*errlines_tail = eitem;
|
|
|
|
|
errlines_tail = &eitem->next;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Other error output. */
|
|
|
|
|
eitem = xmalloc (sizeof *eitem + strlen (p));
|
|
|
|
|
eitem->next = NULL;
|
|
|
|
|
strcpy (eitem->buffer, p);
|
|
|
|
|
eitem->fname = NULL;
|
|
|
|
|
eitem->errtext = eitem->buffer;
|
|
|
|
|
eitem->lineno = 0;
|
|
|
|
|
*errlines_tail = eitem;
|
|
|
|
|
errlines_tail = &eitem->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
pos = 0;
|
|
|
|
|
/* If this was not a complete line mark that we are in a
|
|
|
|
|
continuation. */
|
|
|
|
|
cont_line = (c != '\n');
|
|
|
|
|
}
|
|
|
|
|
}
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2007-08-29 18:59:20 +02:00
|
|
|
|
/* We ignore error lines not terminated by a LF. */
|
|
|
|
|
return errlines;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2019-05-16 12:24:08 +02:00
|
|
|
|
/* Check the options of a single component. If CONF_FILE is NULL the
|
|
|
|
|
* standard config file is used. If OUT is not NULL the output is
|
|
|
|
|
* written to that stream. Returns 0 if everything is OK. */
|
2008-05-20 00:46:41 +02:00
|
|
|
|
int
|
2010-08-18 21:25:15 +02:00
|
|
|
|
gc_component_check_options (int component, estream_t out, const char *conf_file)
|
2007-08-29 11:51:37 +02:00
|
|
|
|
{
|
2007-08-29 18:59:20 +02:00
|
|
|
|
gpg_error_t err;
|
2007-08-29 11:51:37 +02:00
|
|
|
|
unsigned int result;
|
|
|
|
|
const char *pgmname;
|
2021-03-26 16:46:51 +01:00
|
|
|
|
const char *argv[6];
|
2008-05-20 00:46:41 +02:00
|
|
|
|
int i;
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_t proc;
|
2010-08-20 14:18:38 +02:00
|
|
|
|
estream_t errfp;
|
2008-05-20 00:46:41 +02:00
|
|
|
|
error_line_t errlines;
|
2007-08-29 11:51:37 +02:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
log_assert (component >= 0 && component < GC_COMPONENT_NR);
|
2008-05-20 00:46:41 +02:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (!gc_component[component].program)
|
|
|
|
|
return 0;
|
|
|
|
|
if (!gc_component[component].module_name)
|
2008-05-20 00:46:41 +02:00
|
|
|
|
return 0;
|
2007-08-29 11:51:37 +02:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
pgmname = gnupg_module_name (gc_component[component].module_name);
|
2008-05-20 00:46:41 +02:00
|
|
|
|
i = 0;
|
2020-03-19 12:43:08 +01:00
|
|
|
|
if (!gnupg_default_homedir_p ()
|
|
|
|
|
&& component != GC_COMPONENT_PINENTRY)
|
|
|
|
|
{
|
|
|
|
|
argv[i++] = "--homedir";
|
|
|
|
|
argv[i++] = gnupg_homedir ();
|
|
|
|
|
}
|
2008-05-20 00:46:41 +02:00
|
|
|
|
if (conf_file)
|
|
|
|
|
{
|
|
|
|
|
argv[i++] = "--options";
|
|
|
|
|
argv[i++] = conf_file;
|
|
|
|
|
}
|
2010-08-19 11:53:55 +02:00
|
|
|
|
if (component == GC_COMPONENT_PINENTRY)
|
|
|
|
|
argv[i++] = "--version";
|
|
|
|
|
else
|
|
|
|
|
argv[i++] = "--gpgconf-test";
|
2021-03-26 16:46:51 +01:00
|
|
|
|
argv[i] = NULL;
|
|
|
|
|
log_assert (i < DIM(argv));
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2008-05-20 00:46:41 +02:00
|
|
|
|
result = 0;
|
|
|
|
|
errlines = NULL;
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
err = gpgrt_process_spawn (pgmname, argv, GPGRT_PROCESS_STDERR_PIPE,
|
2024-05-31 08:36:39 +02:00
|
|
|
|
NULL, &proc);
|
2010-08-20 14:18:38 +02:00
|
|
|
|
if (err)
|
|
|
|
|
result |= 1; /* Program could not be run. */
|
2011-02-23 10:15:34 +01:00
|
|
|
|
else
|
2008-05-20 00:46:41 +02:00
|
|
|
|
{
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_get_streams (proc, 0, NULL, NULL, &errfp);
|
2011-02-23 10:15:34 +01:00
|
|
|
|
errlines = collect_error_output (errfp,
|
2008-05-20 00:46:41 +02:00
|
|
|
|
gc_component[component].name);
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
if (!gpgrt_process_wait (proc, 1))
|
2008-05-20 00:46:41 +02:00
|
|
|
|
{
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 12:18:21 +02:00
|
|
|
|
int exitcode;
|
|
|
|
|
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_ctl (proc, GPGRT_PROCESS_GET_EXIT_ID, &exitcode);
|
2008-05-20 00:46:41 +02:00
|
|
|
|
if (exitcode == -1)
|
|
|
|
|
result |= 1; /* Program could not be run or it
|
|
|
|
|
terminated abnormally. */
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 12:18:21 +02:00
|
|
|
|
else if (exitcode)
|
|
|
|
|
result |= 2; /* Program returned an error. */
|
2008-05-20 00:46:41 +02:00
|
|
|
|
}
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_release (proc);
|
2010-08-20 14:18:38 +02:00
|
|
|
|
es_fclose (errfp);
|
2008-05-20 00:46:41 +02:00
|
|
|
|
}
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2008-05-20 00:46:41 +02:00
|
|
|
|
/* If the program could not be run, we can't tell whether
|
|
|
|
|
the config file is good. */
|
|
|
|
|
if (result & 1)
|
2011-02-23 10:15:34 +01:00
|
|
|
|
result |= 2;
|
|
|
|
|
|
2008-05-20 00:46:41 +02:00
|
|
|
|
if (out)
|
|
|
|
|
{
|
|
|
|
|
const char *desc;
|
|
|
|
|
error_line_t errptr;
|
|
|
|
|
|
|
|
|
|
desc = gc_component[component].desc;
|
|
|
|
|
desc = my_dgettext (gc_component[component].desc_domain, desc);
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fprintf (out, "%s:%s:",
|
2020-03-12 10:16:56 +01:00
|
|
|
|
gc_component[component].program, gc_percent_escape (desc));
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fputs (gc_percent_escape (pgmname), out);
|
|
|
|
|
es_fprintf (out, ":%d:%d:", !(result & 1), !(result & 2));
|
2008-05-20 00:46:41 +02:00
|
|
|
|
for (errptr = errlines; errptr; errptr = errptr->next)
|
|
|
|
|
{
|
|
|
|
|
if (errptr != errlines)
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fputs ("\n:::::", out); /* Continuation line. */
|
2008-05-20 00:46:41 +02:00
|
|
|
|
if (errptr->fname)
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fputs (gc_percent_escape (errptr->fname), out);
|
|
|
|
|
es_putc (':', out);
|
2008-05-20 00:46:41 +02:00
|
|
|
|
if (errptr->fname)
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fprintf (out, "%u", errptr->lineno);
|
|
|
|
|
es_putc (':', out);
|
|
|
|
|
es_fputs (gc_percent_escape (errptr->errtext), out);
|
|
|
|
|
es_putc (':', out);
|
2008-05-20 00:46:41 +02:00
|
|
|
|
}
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_putc ('\n', out);
|
2008-05-20 00:46:41 +02:00
|
|
|
|
}
|
2007-08-29 11:51:37 +02:00
|
|
|
|
|
2008-05-20 00:46:41 +02:00
|
|
|
|
while (errlines)
|
|
|
|
|
{
|
|
|
|
|
error_line_t tmp = errlines->next;
|
|
|
|
|
xfree (errlines);
|
|
|
|
|
errlines = tmp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2010-08-19 11:53:55 +02:00
|
|
|
|
|
2008-05-20 00:46:41 +02:00
|
|
|
|
/* Check all components that are available. */
|
|
|
|
|
void
|
2010-08-18 21:25:15 +02:00
|
|
|
|
gc_check_programs (estream_t out)
|
2008-05-20 00:46:41 +02:00
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
gc_component_id_t component;
|
2008-05-20 00:46:41 +02:00
|
|
|
|
|
|
|
|
|
for (component = 0; component < GC_COMPONENT_NR; component++)
|
|
|
|
|
gc_component_check_options (component, out, NULL);
|
2007-08-29 11:51:37 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
|
|
|
|
/* Find the component with the name NAME. Returns -1 if not
|
|
|
|
|
found. */
|
|
|
|
|
int
|
|
|
|
|
gc_component_find (const char *name)
|
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
gc_component_id_t idx;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
|
|
|
|
for (idx = 0; idx < GC_COMPONENT_NR; idx++)
|
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (gc_component[idx].program
|
|
|
|
|
&& !strcmp (name, gc_component[idx].program))
|
2004-01-29 00:58:18 +01:00
|
|
|
|
return idx;
|
|
|
|
|
}
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-02-26 23:45:19 +01:00
|
|
|
|
/* List the option OPTION. */
|
|
|
|
|
static void
|
2020-03-12 10:16:56 +01:00
|
|
|
|
list_one_option (gc_component_id_t component,
|
|
|
|
|
const gc_option_t *option, estream_t out)
|
2004-02-26 23:45:19 +01:00
|
|
|
|
{
|
|
|
|
|
const char *desc = NULL;
|
|
|
|
|
char *arg_name = NULL;
|
2020-03-12 10:16:56 +01:00
|
|
|
|
unsigned long flags;
|
|
|
|
|
const char *desc_domain = gc_component[component].desc_domain;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2021-12-30 10:18:23 +01:00
|
|
|
|
/* Don't show options with the ignore attribute. */
|
|
|
|
|
if (option->attr_ignore && !option->attr_force)
|
|
|
|
|
return;
|
|
|
|
|
|
2004-02-26 23:45:19 +01:00
|
|
|
|
if (option->desc)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
desc = my_dgettext (desc_domain, option->desc);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2004-02-26 23:45:19 +01:00
|
|
|
|
if (*desc == '|')
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2004-02-26 23:45:19 +01:00
|
|
|
|
const char *arg_tail = strchr (&desc[1], '|');
|
|
|
|
|
|
|
|
|
|
if (arg_tail)
|
|
|
|
|
{
|
|
|
|
|
int arg_len = arg_tail - &desc[1];
|
|
|
|
|
arg_name = xmalloc (arg_len + 1);
|
|
|
|
|
memcpy (arg_name, &desc[1], arg_len);
|
|
|
|
|
arg_name[arg_len] = '\0';
|
|
|
|
|
desc = arg_tail + 1;
|
|
|
|
|
}
|
2004-01-29 00:58:18 +01:00
|
|
|
|
}
|
2004-02-26 23:45:19 +01:00
|
|
|
|
}
|
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2004-02-26 23:45:19 +01:00
|
|
|
|
/* YOU MUST NOT REORDER THE FIELDS IN THIS OUTPUT, AS THEIR ORDER IS
|
|
|
|
|
PART OF THE EXTERNAL INTERFACE. YOU MUST NOT REMOVE ANY
|
|
|
|
|
FIELDS. */
|
|
|
|
|
|
|
|
|
|
/* The name field. */
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fprintf (out, "%s", option->name);
|
2004-02-26 23:45:19 +01:00
|
|
|
|
|
|
|
|
|
/* The flags field. */
|
2020-03-12 10:16:56 +01:00
|
|
|
|
flags = 0;
|
|
|
|
|
if (option->is_header) flags |= GC_OPT_FLAG_GROUP;
|
|
|
|
|
if (option->is_list) flags |= GC_OPT_FLAG_LIST;
|
|
|
|
|
if (option->runtime) flags |= GC_OPT_FLAG_RUNTIME;
|
|
|
|
|
if (option->has_default) flags |= GC_OPT_FLAG_DEFAULT;
|
|
|
|
|
if (option->def_in_desc) flags |= GC_OPT_FLAG_DEF_DESC;
|
|
|
|
|
if (option->no_arg_desc) flags |= GC_OPT_FLAG_NO_ARG_DESC;
|
|
|
|
|
if (option->no_change) flags |= GC_OPT_FLAG_NO_CHANGE;
|
2021-12-30 10:18:23 +01:00
|
|
|
|
if (option->attr_force) flags |= GC_OPT_FLAG_NO_CHANGE;
|
2020-03-12 10:16:56 +01:00
|
|
|
|
es_fprintf (out, ":%lu", flags);
|
2004-02-26 23:45:19 +01:00
|
|
|
|
if (opt.verbose)
|
|
|
|
|
{
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_putc (' ', out);
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (!flags)
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fprintf (out, "none");
|
2004-02-26 23:45:19 +01:00
|
|
|
|
else
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2004-02-26 23:45:19 +01:00
|
|
|
|
unsigned long flag = 0;
|
|
|
|
|
unsigned long first = 1;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2004-02-26 23:45:19 +01:00
|
|
|
|
while (flags)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2004-02-26 23:45:19 +01:00
|
|
|
|
if (flags & 1)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2004-02-26 23:45:19 +01:00
|
|
|
|
if (first)
|
|
|
|
|
first = 0;
|
|
|
|
|
else
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_putc (',', out);
|
|
|
|
|
es_fprintf (out, "%s", gc_flag[flag].name);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
}
|
2004-02-26 23:45:19 +01:00
|
|
|
|
flags >>= 1;
|
|
|
|
|
flag++;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
2004-02-26 23:45:19 +01:00
|
|
|
|
}
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2004-02-26 23:45:19 +01:00
|
|
|
|
/* The level field. */
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fprintf (out, ":%u", option->level);
|
2004-02-26 23:45:19 +01:00
|
|
|
|
if (opt.verbose)
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fprintf (out, " %s", gc_level[option->level].name);
|
2004-02-26 23:45:19 +01:00
|
|
|
|
|
|
|
|
|
/* The description field. */
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fprintf (out, ":%s", desc ? gc_percent_escape (desc) : "");
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2004-02-26 23:45:19 +01:00
|
|
|
|
/* The type field. */
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fprintf (out, ":%u", option->arg_type);
|
2004-02-26 23:45:19 +01:00
|
|
|
|
if (opt.verbose)
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fprintf (out, " %s", gc_arg_type[option->arg_type].name);
|
2004-02-26 23:45:19 +01:00
|
|
|
|
|
|
|
|
|
/* The alternate type field. */
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fprintf (out, ":%u", gc_arg_type[option->arg_type].fallback);
|
2004-02-26 23:45:19 +01:00
|
|
|
|
if (opt.verbose)
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fprintf (out, " %s",
|
|
|
|
|
gc_arg_type[gc_arg_type[option->arg_type].fallback].name);
|
2004-02-26 23:45:19 +01:00
|
|
|
|
|
|
|
|
|
/* The argument name field. */
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fprintf (out, ":%s", arg_name ? gc_percent_escape (arg_name) : "");
|
|
|
|
|
xfree (arg_name);
|
2004-02-26 23:45:19 +01:00
|
|
|
|
|
|
|
|
|
/* The default value field. */
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fprintf (out, ":%s", option->default_value ? option->default_value : "");
|
2004-02-26 23:45:19 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The default argument field. This was never used and is thus empty. */
|
|
|
|
|
es_fprintf (out, ":");
|
2004-02-26 23:45:19 +01:00
|
|
|
|
|
|
|
|
|
/* The value field. */
|
|
|
|
|
if (gc_arg_type[option->arg_type].fallback == GC_ARG_TYPE_NONE
|
2020-03-12 10:16:56 +01:00
|
|
|
|
&& option->is_list && option->value)
|
|
|
|
|
{
|
|
|
|
|
/* The special format "1,1,1,1,...,1" is converted to a number
|
|
|
|
|
here. */
|
|
|
|
|
es_fprintf (out, ":%u", (unsigned int)((strlen (option->value) + 1) / 2));
|
|
|
|
|
}
|
2004-02-26 23:45:19 +01:00
|
|
|
|
else
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fprintf (out, ":%s", option->value ? option->value : "");
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2004-02-26 23:45:19 +01:00
|
|
|
|
/* ADD NEW FIELDS HERE. */
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_putc ('\n', out);
|
2004-02-26 23:45:19 +01:00
|
|
|
|
}
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2004-02-26 23:45:19 +01:00
|
|
|
|
|
|
|
|
|
/* List all options of the component COMPONENT. */
|
|
|
|
|
void
|
2010-08-18 21:25:15 +02:00
|
|
|
|
gc_component_list_options (int component, estream_t out)
|
2011-02-23 10:15:34 +01:00
|
|
|
|
{
|
2004-02-26 23:45:19 +01:00
|
|
|
|
const gc_option_t *option = gc_component[component].options;
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
for ( ; option && option->name; option++)
|
2004-02-26 23:45:19 +01:00
|
|
|
|
{
|
|
|
|
|
/* Do not output unknown or internal options. */
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (!option->is_header
|
2020-03-14 18:53:43 +01:00
|
|
|
|
&& option->level == GC_LEVEL_INTERNAL)
|
2004-02-26 23:45:19 +01:00
|
|
|
|
continue;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (option->is_header)
|
2004-02-26 23:45:19 +01:00
|
|
|
|
{
|
2007-12-10 17:44:38 +01:00
|
|
|
|
const gc_option_t *group_option = option + 1;
|
|
|
|
|
gc_expert_level_t level = GC_LEVEL_NR;
|
|
|
|
|
|
|
|
|
|
/* The manual states that the group level is always the
|
|
|
|
|
minimum of the levels of all contained options. Due to
|
|
|
|
|
different active options, and because it is hard to
|
|
|
|
|
maintain manually, we calculate it here. The value in
|
|
|
|
|
the global static table is ignored. */
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
for ( ; group_option->name; group_option++)
|
2004-02-26 23:45:19 +01:00
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (group_option->is_header)
|
2007-12-10 17:44:38 +01:00
|
|
|
|
break;
|
|
|
|
|
if (group_option->level < level)
|
|
|
|
|
level = group_option->level;
|
2004-02-26 23:45:19 +01:00
|
|
|
|
}
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2007-12-10 17:44:38 +01:00
|
|
|
|
/* Check if group is empty. */
|
|
|
|
|
if (level != GC_LEVEL_NR)
|
|
|
|
|
{
|
|
|
|
|
gc_option_t opt_copy;
|
|
|
|
|
|
|
|
|
|
/* Fix up the group level. */
|
2020-03-12 10:16:56 +01:00
|
|
|
|
opt_copy = *option;
|
2007-12-10 17:44:38 +01:00
|
|
|
|
opt_copy.level = level;
|
2020-03-12 10:16:56 +01:00
|
|
|
|
list_one_option (component, &opt_copy, out);
|
2007-12-10 17:44:38 +01:00
|
|
|
|
}
|
2004-02-26 23:45:19 +01:00
|
|
|
|
}
|
2007-12-10 17:44:38 +01:00
|
|
|
|
else
|
2020-03-12 10:16:56 +01:00
|
|
|
|
list_one_option (component, option, out);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* Return true if the option NAME is known and that we want it as
|
|
|
|
|
* gpgconf managed option. */
|
|
|
|
|
static known_option_t *
|
|
|
|
|
is_known_option (gc_component_id_t component, const char *name)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
known_option_t *option = gc_component[component].known_options;
|
|
|
|
|
if (option)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
for (; option->name; option++)
|
|
|
|
|
if (!strcmp (option->name, name))
|
|
|
|
|
break;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
}
|
2020-03-14 18:53:43 +01:00
|
|
|
|
return (option && option->name)? option : NULL;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
}
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
|
|
|
|
|
/* Find the option NAME in component COMPONENT. Returns pointer to
|
|
|
|
|
* the option descriptor or NULL if not found. */
|
|
|
|
|
static gc_option_t *
|
|
|
|
|
find_option (gc_component_id_t component, const char *name)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
gc_option_t *option = gc_component[component].options;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (option)
|
|
|
|
|
{
|
|
|
|
|
for (; option->name; option++)
|
|
|
|
|
{
|
|
|
|
|
if (!option->is_header
|
|
|
|
|
&& !strcmp (option->name, name))
|
|
|
|
|
return option;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
}
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
|
2021-03-23 12:16:37 +01:00
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2021-03-23 12:16:37 +01:00
|
|
|
|
struct read_line_wrapper_parm_s
|
|
|
|
|
{
|
|
|
|
|
const char *pgmname;
|
|
|
|
|
estream_t fp;
|
|
|
|
|
char *line;
|
|
|
|
|
size_t line_len;
|
|
|
|
|
const char **extra_lines;
|
|
|
|
|
int extra_lines_idx;
|
|
|
|
|
char *extra_line_buffer;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Helper for retrieve_options_from_program. */
|
|
|
|
|
static ssize_t
|
|
|
|
|
read_line_wrapper (struct read_line_wrapper_parm_s *parm)
|
|
|
|
|
{
|
|
|
|
|
ssize_t length;
|
|
|
|
|
const char *extra_line;
|
|
|
|
|
|
|
|
|
|
if (parm->fp)
|
|
|
|
|
{
|
|
|
|
|
length = es_read_line (parm->fp, &parm->line, &parm->line_len, NULL);
|
|
|
|
|
if (length > 0)
|
|
|
|
|
return length;
|
|
|
|
|
if (length < 0 || es_ferror (parm->fp))
|
|
|
|
|
gc_error (1, errno, "error reading from %s", parm->pgmname);
|
|
|
|
|
if (es_fclose (parm->fp))
|
|
|
|
|
gc_error (1, errno, "error closing %s", parm->pgmname);
|
|
|
|
|
/* EOF seen. */
|
|
|
|
|
parm->fp = NULL;
|
|
|
|
|
}
|
|
|
|
|
/* Return the made up lines. */
|
|
|
|
|
if (!parm->extra_lines
|
|
|
|
|
|| !(extra_line = parm->extra_lines[parm->extra_lines_idx]))
|
|
|
|
|
return -1; /* This is really the EOF. */
|
|
|
|
|
parm->extra_lines_idx++;
|
|
|
|
|
xfree (parm->extra_line_buffer);
|
|
|
|
|
parm->extra_line_buffer = xstrdup (extra_line);
|
|
|
|
|
return strlen (parm->extra_line_buffer);
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* Retrieve the options for the component COMPONENT. With
|
2017-10-24 12:01:07 +02:00
|
|
|
|
* ONLY_INSTALLED set components which are not installed are silently
|
|
|
|
|
* ignored. */
|
2004-01-29 00:58:18 +01:00
|
|
|
|
static void
|
2020-03-12 10:16:56 +01:00
|
|
|
|
retrieve_options_from_program (gc_component_id_t component, int only_installed)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2007-10-22 21:07:56 +02:00
|
|
|
|
gpg_error_t err;
|
|
|
|
|
const char *pgmname;
|
|
|
|
|
const char *argv[2];
|
2010-08-20 14:18:38 +02:00
|
|
|
|
estream_t outfp;
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_t proc;
|
2020-03-12 10:16:56 +01:00
|
|
|
|
known_option_t *known_option;
|
2020-03-05 16:23:52 +01:00
|
|
|
|
gc_option_t *option;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
char *line = NULL;
|
2021-03-23 12:16:37 +01:00
|
|
|
|
size_t line_len;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
ssize_t length;
|
2020-03-05 16:23:52 +01:00
|
|
|
|
const char *config_name;
|
|
|
|
|
gpgrt_argparse_t pargs;
|
|
|
|
|
int dummy_argc;
|
2020-03-19 12:43:08 +01:00
|
|
|
|
char *twopartconfig_name = NULL;
|
2020-03-12 10:16:56 +01:00
|
|
|
|
gpgrt_opt_t *opt_table = NULL; /* A malloced option table. */
|
|
|
|
|
size_t opt_table_used = 0; /* Its current length. */
|
|
|
|
|
size_t opt_table_size = 0; /* Its allocated length. */
|
|
|
|
|
gc_option_t *opt_info = NULL; /* A malloced options table. */
|
|
|
|
|
size_t opt_info_used = 0; /* Its current length. */
|
|
|
|
|
size_t opt_info_size = 0; /* Its allocated length. */
|
2020-03-05 16:23:52 +01:00
|
|
|
|
int i;
|
2021-03-23 12:16:37 +01:00
|
|
|
|
struct read_line_wrapper_parm_s read_line_parm;
|
|
|
|
|
int pseudo_count;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
pgmname = (gc_component[component].module_name
|
|
|
|
|
? gnupg_module_name (gc_component[component].module_name)
|
|
|
|
|
: gc_component[component].program );
|
2007-10-22 21:07:56 +02:00
|
|
|
|
|
2020-10-20 10:43:55 +02:00
|
|
|
|
if (only_installed && gnupg_access (pgmname, X_OK))
|
2017-10-24 12:01:07 +02:00
|
|
|
|
{
|
|
|
|
|
return; /* The component is not installed. */
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-05 16:23:52 +01:00
|
|
|
|
|
|
|
|
|
/* First we need to read the option table from the program. */
|
|
|
|
|
argv[0] = "--dump-option-table";
|
|
|
|
|
argv[1] = NULL;
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
err = gpgrt_process_spawn (pgmname, argv, GPGRT_PROCESS_STDOUT_PIPE,
|
2024-05-31 08:36:39 +02:00
|
|
|
|
NULL, &proc);
|
2020-03-05 16:23:52 +01:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
gc_error (1, 0, "could not gather option table from '%s': %s",
|
|
|
|
|
pgmname, gpg_strerror (err));
|
|
|
|
|
}
|
|
|
|
|
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_get_streams (proc, 0, NULL, &outfp, NULL);
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 12:18:21 +02:00
|
|
|
|
|
2021-03-23 12:16:37 +01:00
|
|
|
|
read_line_parm.pgmname = pgmname;
|
|
|
|
|
read_line_parm.fp = outfp;
|
|
|
|
|
read_line_parm.line = line;
|
|
|
|
|
read_line_parm.line_len = line_len = 0;
|
|
|
|
|
read_line_parm.extra_line_buffer = NULL;
|
|
|
|
|
read_line_parm.extra_lines = gc_component[component].known_pseudo_options;
|
|
|
|
|
read_line_parm.extra_lines_idx = 0;
|
|
|
|
|
pseudo_count = 0;
|
|
|
|
|
while ((length = read_line_wrapper (&read_line_parm)) > 0)
|
2020-03-05 16:23:52 +01:00
|
|
|
|
{
|
common,agent,dirmngr,g10,tools: Fix split_fields API.
* common/stringhelp.h (split_fields): Use const * for the strings in
the ARRAY.
(split_fields_colon): Likewise.
* common/stringhelp.c (split_fields, split_fields_colon): Fix
the implementation.
* agent/call-scd.c, agent/command.c: Follow the change.
* common/t-stringhelp.c, dirmngr/loadswdb.c: Likewise.
* g10/call-agent.c, tools/card-call-scd.c: Likewise.
* tools/card-yubikey.c, tools/gpg-card.c: Likewise.
* tools/gpg-card.h, tools/gpg-wks-client.c: Likewise.
* tools/gpgconf-comp.c, tools/gpgconf.c: Likewise.
* tools/wks-util.c: Likewise.
--
The strings in the ARRAY don't need to be released by caller, as those
are references. It's easier to follow the code when it's explicitly
const *.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2020-09-18 03:20:23 +02:00
|
|
|
|
const char *fields[4];
|
|
|
|
|
const char *optname, *optdesc;
|
2020-03-12 10:16:56 +01:00
|
|
|
|
unsigned int optflags;
|
|
|
|
|
int short_opt;
|
|
|
|
|
gc_arg_type_t arg_type;
|
2021-03-23 12:16:37 +01:00
|
|
|
|
int pseudo = 0;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (read_line_parm.extra_line_buffer)
|
|
|
|
|
{
|
|
|
|
|
line = read_line_parm.extra_line_buffer;
|
|
|
|
|
pseudo = 1;
|
|
|
|
|
pseudo_count++;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
line = read_line_parm.line;
|
2020-03-05 16:23:52 +01:00
|
|
|
|
|
|
|
|
|
/* Strip newline and carriage return, if present. */
|
|
|
|
|
while (length > 0
|
|
|
|
|
&& (line[length - 1] == '\n' || line[length - 1] == '\r'))
|
|
|
|
|
line[--length] = '\0';
|
|
|
|
|
|
|
|
|
|
if (split_fields_colon (line, fields, DIM (fields)) < 4)
|
|
|
|
|
{
|
|
|
|
|
gc_error (0,0, "WARNING: invalid line in option table of '%s'\n",
|
|
|
|
|
pgmname);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
optname = fields[0];
|
|
|
|
|
short_opt = atoi (fields[1]);
|
2021-03-23 12:16:37 +01:00
|
|
|
|
if (short_opt < 1 && !pseudo)
|
2020-03-12 10:16:56 +01:00
|
|
|
|
{
|
|
|
|
|
gc_error (0,0, "WARNING: bad short option in option table of '%s'\n",
|
|
|
|
|
pgmname);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
optflags = strtoul (fields[2], NULL, 10);
|
|
|
|
|
if ((optflags & ARGPARSE_OPT_HEADER))
|
|
|
|
|
known_option = NULL; /* We want all header-only options. */
|
|
|
|
|
else if ((known_option = is_known_option (component, optname)))
|
|
|
|
|
; /* Yes we want this one. */
|
|
|
|
|
else
|
|
|
|
|
continue; /* No need to store this option description. */
|
|
|
|
|
|
2020-03-05 16:23:52 +01:00
|
|
|
|
/* The +1 here is to make sure that we will have a zero item at
|
|
|
|
|
* the end of the table. */
|
|
|
|
|
if (opt_table_used + 1 >= opt_table_size)
|
|
|
|
|
{
|
|
|
|
|
/* Note that this also does the initial allocation. */
|
|
|
|
|
opt_table_size += 128;
|
|
|
|
|
opt_table = xreallocarray (opt_table,
|
|
|
|
|
opt_table_used,
|
|
|
|
|
opt_table_size,
|
|
|
|
|
sizeof *opt_table);
|
|
|
|
|
}
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* The +1 here is to make sure that we will have a zero item at
|
|
|
|
|
* the end of the table. */
|
|
|
|
|
if (opt_info_used + 1 >= opt_info_size)
|
|
|
|
|
{
|
|
|
|
|
/* Note that this also does the initial allocation. */
|
|
|
|
|
opt_info_size += 128;
|
|
|
|
|
opt_info = xreallocarray (opt_info,
|
|
|
|
|
opt_info_used,
|
|
|
|
|
opt_info_size,
|
|
|
|
|
sizeof *opt_info);
|
|
|
|
|
}
|
|
|
|
|
/* The +1 here accounts for the two items we are going to add to
|
2021-03-23 12:16:37 +01:00
|
|
|
|
* the global string table. */
|
2020-03-05 16:23:52 +01:00
|
|
|
|
if (string_array_used + 1 >= string_array_size)
|
|
|
|
|
{
|
|
|
|
|
string_array_size += 256;
|
|
|
|
|
string_array = xreallocarray (string_array,
|
|
|
|
|
string_array_used,
|
|
|
|
|
string_array_size,
|
|
|
|
|
sizeof *string_array);
|
|
|
|
|
}
|
common,agent,dirmngr,g10,tools: Fix split_fields API.
* common/stringhelp.h (split_fields): Use const * for the strings in
the ARRAY.
(split_fields_colon): Likewise.
* common/stringhelp.c (split_fields, split_fields_colon): Fix
the implementation.
* agent/call-scd.c, agent/command.c: Follow the change.
* common/t-stringhelp.c, dirmngr/loadswdb.c: Likewise.
* g10/call-agent.c, tools/card-call-scd.c: Likewise.
* tools/card-yubikey.c, tools/gpg-card.c: Likewise.
* tools/gpg-card.h, tools/gpg-wks-client.c: Likewise.
* tools/gpgconf-comp.c, tools/gpgconf.c: Likewise.
* tools/wks-util.c: Likewise.
--
The strings in the ARRAY don't need to be released by caller, as those
are references. It's easier to follow the code when it's explicitly
const *.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2020-09-18 03:20:23 +02:00
|
|
|
|
optname = string_array[string_array_used++] = xstrdup (fields[0]);
|
|
|
|
|
optdesc = string_array[string_array_used++] = xstrdup (fields[3]);
|
2020-03-05 16:23:52 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* Create an option table which can then be supplied to
|
|
|
|
|
* gpgrt_parser. Unfortunately there is no private pointer in
|
|
|
|
|
* the public option table struct so that we can't add extra
|
|
|
|
|
* data we need here. Thus we need to build up another table
|
2024-05-13 00:09:23 +02:00
|
|
|
|
* for such info and for ease of use we also copy there the
|
2020-03-12 10:16:56 +01:00
|
|
|
|
* data from the option table. It is not possible to use the
|
|
|
|
|
* known_option_s for this because that one does not carry
|
|
|
|
|
* header lines and it might also be problematic to use such
|
|
|
|
|
* static tables for caching options and default values. */
|
2021-03-23 12:16:37 +01:00
|
|
|
|
if (!pseudo)
|
|
|
|
|
{
|
|
|
|
|
opt_table[opt_table_used].long_opt = optname;
|
|
|
|
|
opt_table[opt_table_used].short_opt = short_opt;
|
|
|
|
|
opt_table[opt_table_used].description = optdesc;
|
|
|
|
|
opt_table[opt_table_used].flags = optflags;
|
|
|
|
|
opt_table_used++;
|
|
|
|
|
}
|
2020-03-05 16:23:52 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* Note that as per argparser specs the opt_table uses "@" to
|
2024-05-13 00:09:23 +02:00
|
|
|
|
* specify an empty description. In the DESC script of
|
2020-03-12 10:16:56 +01:00
|
|
|
|
* options (opt_info_t) we want to have a real empty string. */
|
|
|
|
|
opt_info[opt_info_used].name = optname;
|
|
|
|
|
if (*optdesc == '@' && !optdesc[1])
|
|
|
|
|
opt_info[opt_info_used].desc = optdesc+1;
|
|
|
|
|
else
|
|
|
|
|
opt_info[opt_info_used].desc = optdesc;
|
|
|
|
|
|
|
|
|
|
/* Unfortunately we need to remap the types. */
|
|
|
|
|
switch ((optflags & ARGPARSE_TYPE_MASK))
|
|
|
|
|
{
|
|
|
|
|
case ARGPARSE_TYPE_INT: arg_type = GC_ARG_TYPE_INT32; break;
|
|
|
|
|
case ARGPARSE_TYPE_LONG: arg_type = GC_ARG_TYPE_INT32; break;
|
|
|
|
|
case ARGPARSE_TYPE_ULONG: arg_type = GC_ARG_TYPE_UINT32; break;
|
|
|
|
|
case ARGPARSE_TYPE_STRING: arg_type = GC_ARG_TYPE_STRING; break;
|
|
|
|
|
default: arg_type = GC_ARG_TYPE_NONE; break;
|
|
|
|
|
}
|
|
|
|
|
opt_info[opt_info_used].arg_type = arg_type;
|
2021-03-23 12:16:37 +01:00
|
|
|
|
if (pseudo) /* Pseudo options are always no_change. */
|
|
|
|
|
opt_info[opt_info_used].no_change = 1;
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
|
|
|
|
|
if ((optflags & ARGPARSE_OPT_HEADER))
|
|
|
|
|
opt_info[opt_info_used].is_header = 1;
|
|
|
|
|
if (known_option)
|
|
|
|
|
{
|
|
|
|
|
if ((known_option->flags & GC_OPT_FLAG_LIST))
|
|
|
|
|
opt_info[opt_info_used].is_list = 1;
|
|
|
|
|
/* FIXME: The next can also be taken from opt_table->flags.
|
|
|
|
|
* We need to check the code whether both specifications match. */
|
|
|
|
|
if ((known_option->flags & GC_OPT_FLAG_ARG_OPT))
|
|
|
|
|
opt_info[opt_info_used].opt_arg = 1;
|
2020-03-14 18:53:43 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if ((known_option->flags & GC_OPT_FLAG_RUNTIME))
|
|
|
|
|
opt_info[opt_info_used].runtime = 1;
|
|
|
|
|
|
|
|
|
|
opt_info[opt_info_used].level = known_option->level;
|
|
|
|
|
/* Override the received argtype by a complex type. */
|
|
|
|
|
if (known_option->arg_type)
|
|
|
|
|
opt_info[opt_info_used].arg_type = known_option->arg_type;
|
|
|
|
|
}
|
|
|
|
|
opt_info_used++;
|
2020-03-05 16:23:52 +01:00
|
|
|
|
}
|
2021-03-23 12:16:37 +01:00
|
|
|
|
xfree (read_line_parm.extra_line_buffer);
|
|
|
|
|
line = read_line_parm.line;
|
|
|
|
|
line_len = read_line_parm.line_len;
|
|
|
|
|
log_assert (opt_table_used + pseudo_count == opt_info_used);
|
|
|
|
|
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
err = gpgrt_process_wait (proc, 1);
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 12:18:21 +02:00
|
|
|
|
if (!err)
|
|
|
|
|
{
|
|
|
|
|
int exitcode;
|
2020-03-05 16:23:52 +01:00
|
|
|
|
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_ctl (proc, GPGRT_PROCESS_GET_EXIT_ID, &exitcode);
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 12:18:21 +02:00
|
|
|
|
if (exitcode)
|
|
|
|
|
gc_error (1, 0, "running %s failed (exitcode=%d): %s",
|
|
|
|
|
pgmname, exitcode, gpg_strerror (err));
|
|
|
|
|
}
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_release (proc);
|
2020-03-05 16:23:52 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* Make the gpgrt option table and the internal option table available. */
|
|
|
|
|
gc_component[component].opt_table = opt_table;
|
|
|
|
|
gc_component[component].options = opt_info;
|
|
|
|
|
|
2020-03-05 16:23:52 +01:00
|
|
|
|
|
|
|
|
|
/* Now read the default options. */
|
|
|
|
|
argv[0] = "--gpgconf-list";
|
|
|
|
|
argv[1] = NULL;
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
err = gpgrt_process_spawn (pgmname, argv, GPGRT_PROCESS_STDOUT_PIPE,
|
2024-05-31 08:36:39 +02:00
|
|
|
|
NULL, &proc);
|
2007-10-22 21:07:56 +02:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
gc_error (1, 0, "could not gather active options from '%s': %s",
|
2007-10-22 21:07:56 +02:00
|
|
|
|
pgmname, gpg_strerror (err));
|
|
|
|
|
}
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_get_streams (proc, 0, NULL, &outfp, NULL);
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 12:18:21 +02:00
|
|
|
|
|
2010-08-20 14:18:38 +02:00
|
|
|
|
while ((length = es_read_line (outfp, &line, &line_len, NULL)) > 0)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2004-02-24 15:31:59 +01:00
|
|
|
|
char *linep;
|
|
|
|
|
unsigned long flags = 0;
|
|
|
|
|
char *default_value = NULL;
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
/* Strip newline and carriage return, if present. */
|
|
|
|
|
while (length > 0
|
|
|
|
|
&& (line[length - 1] == '\n' || line[length - 1] == '\r'))
|
|
|
|
|
line[--length] = '\0';
|
|
|
|
|
|
2004-02-24 15:31:59 +01:00
|
|
|
|
linep = strchr (line, ':');
|
|
|
|
|
if (linep)
|
|
|
|
|
*(linep++) = '\0';
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2004-02-24 15:31:59 +01:00
|
|
|
|
/* Extract additional flags. Default to none. */
|
|
|
|
|
if (linep)
|
|
|
|
|
{
|
|
|
|
|
char *end;
|
|
|
|
|
char *tail;
|
|
|
|
|
|
|
|
|
|
end = strchr (linep, ':');
|
|
|
|
|
if (end)
|
|
|
|
|
*(end++) = '\0';
|
|
|
|
|
|
2010-03-29 14:57:11 +02:00
|
|
|
|
gpg_err_set_errno (0);
|
2004-02-24 15:31:59 +01:00
|
|
|
|
flags = strtoul (linep, &tail, 0);
|
|
|
|
|
if (errno)
|
2007-10-22 21:07:56 +02:00
|
|
|
|
gc_error (1, errno, "malformed flags in option %s from %s",
|
|
|
|
|
line, pgmname);
|
2004-02-24 15:31:59 +01:00
|
|
|
|
if (!(*tail == '\0' || *tail == ':' || *tail == ' '))
|
2007-10-22 21:07:56 +02:00
|
|
|
|
gc_error (1, 0, "garbage after flags in option %s from %s",
|
|
|
|
|
line, pgmname);
|
2004-02-24 15:31:59 +01:00
|
|
|
|
|
|
|
|
|
linep = end;
|
|
|
|
|
}
|
|
|
|
|
|
2004-01-31 14:58:27 +01:00
|
|
|
|
/* Extract default value, if present. Default to empty if
|
|
|
|
|
not. */
|
2004-02-24 15:31:59 +01:00
|
|
|
|
if (linep)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2004-01-31 14:58:27 +01:00
|
|
|
|
char *end;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2004-02-24 15:31:59 +01:00
|
|
|
|
end = strchr (linep, ':');
|
2004-01-31 14:58:27 +01:00
|
|
|
|
if (end)
|
2004-02-24 15:31:59 +01:00
|
|
|
|
*(end++) = '\0';
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if ((flags & GC_OPT_FLAG_DEFAULT))
|
2004-02-24 15:31:59 +01:00
|
|
|
|
default_value = linep;
|
|
|
|
|
|
|
|
|
|
linep = end;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Look up the option in the component and install the
|
|
|
|
|
configuration data. */
|
2020-03-12 10:16:56 +01:00
|
|
|
|
option = find_option (component, line);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
if (option)
|
|
|
|
|
{
|
2020-03-14 18:53:43 +01:00
|
|
|
|
if (option->gpgconf_list)
|
2020-03-12 10:16:56 +01:00
|
|
|
|
gc_error (1, errno,
|
|
|
|
|
"option %s returned twice from \"%s --gpgconf-list\"",
|
2007-10-22 21:07:56 +02:00
|
|
|
|
line, pgmname);
|
2020-03-14 18:53:43 +01:00
|
|
|
|
option->gpgconf_list = 1;
|
2004-02-24 15:31:59 +01:00
|
|
|
|
|
2020-03-14 18:53:43 +01:00
|
|
|
|
if ((flags & GC_OPT_FLAG_DEFAULT))
|
|
|
|
|
option->has_default = 1;
|
|
|
|
|
if ((flags & GC_OPT_FLAG_DEF_DESC))
|
|
|
|
|
option->def_in_desc = 1;
|
|
|
|
|
if ((flags & GC_OPT_FLAG_NO_ARG_DESC))
|
|
|
|
|
option->no_arg_desc = 1;
|
|
|
|
|
if ((flags & GC_OPT_FLAG_NO_CHANGE))
|
|
|
|
|
option->no_change = 1;
|
2020-03-12 10:16:56 +01:00
|
|
|
|
|
2004-02-24 15:31:59 +01:00
|
|
|
|
if (default_value && *default_value)
|
|
|
|
|
option->default_value = xstrdup (default_value);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
2010-08-20 14:18:38 +02:00
|
|
|
|
if (length < 0 || es_ferror (outfp))
|
|
|
|
|
gc_error (1, errno, "error reading from %s", pgmname);
|
2010-08-23 21:26:05 +02:00
|
|
|
|
if (es_fclose (outfp))
|
2007-10-22 21:07:56 +02:00
|
|
|
|
gc_error (1, errno, "error closing %s", pgmname);
|
|
|
|
|
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
err = gpgrt_process_wait (proc, 1);
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 12:18:21 +02:00
|
|
|
|
if (!err)
|
|
|
|
|
{
|
|
|
|
|
int exitcode;
|
|
|
|
|
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_ctl (proc, GPGRT_PROCESS_GET_EXIT_ID, &exitcode);
|
common,agent,gpg,dirmngr,g13,scd,tests,tools: New spawn function.
* common/exechelp-posix.c (do_exec, gnupg_spawn_process): Remove.
(check_syscall_func, pre_syscall, post_syscall) : New.
(do_create_socketpair, posix_open_null, call_spawn_cb): New.
(my_exec, spawn_detached, gnupg_spawn_helper): New.
(gnupg_process_spawn, process_kill, gnupg_process_terminate): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_release): New.
(gnupg_process_wait_list): New.
* common/exechelp-w32.c: Add definition of _WIN32_WINNT as 0x600.
(check_syscall_func, pre_syscall, post_syscall): New.
(gnupg_spawn_process): Remove.
(check_windows_version): New.
(spawn_detached, gnupg_spawn_helper, gnupg_process_spawn): New.
(gnupg_process_get_fds, gnupg_process_get_streams): New.
(process_kill, process_vctl, gnupg_process_ctl): New.
(gnupg_process_wait, gnupg_process_terminate): New.
(gnupg_process_release, gnupg_process_wait_list): New.
* common/exechelp.h: Re-write for new API.
* common/exectool.c (gnupg_exec_tool_stream): Follow the change.
* common/asshelp.c (start_new_service): Likewise.
* agent/genkey.c (do_check_passphrase_pattern): Likewise.
* dirmngr/ldap-wrapper.c (struct wrapper_context_s): Use PROC.
(destroy_wrapper): Follow the change of API.
(read_log_data): Follow the change of API, use printable_pid.
(ldap_reaper_thread, ldap_wrapper_release_context): Likewise.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Likewise.
* g10/photoid.c (run_with_pipe): Follow the change of API.
(show_photo): Likewise.
* g13/be-encfs.c (run_umount_helper): Likewise.
(run_encfs_tool): Likewise.
* g13/g13.c: Add including ./common/exechelp.h.
* g13/mount.c: Likewise.
* g13/runner.c: Follow the change of API.
* g13/runner.h: Follow the change of API.
* scd/app.c (setup_env): New.
(report_change): Follow the change of API.
* tests/gpgscm/ffi.c (proc_object_finalize): New.
(proc_object_to_string): New.
(proc_wrap, proc_unwrap): New.
(do_spawn_process): Remove.
(do_process_spawn): New.
(setup_std_fds): New.
(do_spawn_process_fd): Remove.
(do_process_spawn_fd): New.
(do_wait_process): Remove.
(do_process_wait): New.
(do_wait_processes): Remove.
* tests/gpgscm/t-child.scm: Follow the change of API.
* tests/gpgscm/tests.scm: Likewise.
* tests/openpgp/defs.scm: Likewise.
* tests/tpm2dtests/defs.scm: Likewise.
* tools/gpg-card.c: Likewise.
* tools/gpgconf-comp.c: Likewise.
* tools/gpgconf.c: Likewise.
* tools/gpgtar-create.c: Likewise.
* tools/gpgtar-extract.c: Likewise.
* tools/gpgtar-list.c: Likewise.
--
GnuPG-bug-id: 6275
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2023-05-11 12:18:21 +02:00
|
|
|
|
if (exitcode)
|
|
|
|
|
gc_error (1, 0, "running %s failed (exitcode=%d): %s",
|
|
|
|
|
pgmname, exitcode, gpg_strerror (err));
|
|
|
|
|
}
|
Use gpgrt_process_spawn API from libgpg-error.
* agent/genkey.c (do_check_passphrase_pattern): Use the gpgrt API.
* common/asshelp.c (start_new_service): Ditto.
* common/exechelp.h: Remove gnupg_process_spawn API.
* common/exechelp-posix.c: Remove gnupg_process_spawn implementation.
* common/exechelp-w32.c: Likewise.
* common/exectool.c (gnupg_exec_tool_stream): Use the gpgrt API.
* common/t-exechelp.c (test_pipe_stream): Remove.
* dirmngr/ldap-wrapper.c (destroy_wrapper, ldap_reaper_thread): Use
the gpgrt API.
(ldap_wrapper_connection_cleanup, ldap_wrapper): Ditto.
* dirmngr/ldap.c, g10/call-keyboxd.c: No need to include exechelp.h.
* g10/photoid.c (run_with_pipe, show_photo): Use the gpgrt API.
* g13/be-encfs.c (run_umount_helper, run_encfs_tool): Ditto.
* g13/g13.c, g13/mount.c, g13/runner.c: No need to include exechelp.h.
* scd/apdu.c: No need to include exechelp.h.
* scd/app.c (report_change): Use the gpgrt API.
* sm/export.c, sm/import.c: No need to include exechelp.h.
* tests/gpgscm/ffi.c (proc_object_finalize, proc_wrap)
(do_process_spawn_io, do_process_spawn_fd, do_process_wait): Use the
gpgrt API.
* tools/gpg-auth.c: No need to include exechelp.h.
* tools/gpg-card.c (cmd_gpg): Use the gpgrt API.
* tools/gpg-connect-agent.c: No need to include exechelp.h.
* tools/gpg-mail-tube.c (mail_tube_encrypt, prepare_for_appimage)
(start_gpg_encrypt): Use the gpgrt API.
* tools/gpgconf-comp.c (gpg_agent_runtime_change)
(scdaemon_runtime_change, tpm2daemon_runtime_change)
(dirmngr_runtime_change, keyboxd_runtime_change)
(gc_component_launch, gc_component_check_options)
(retrieve_options_from_program): Ditto.
* tools/gpgconf.c (show_versions_via_dirmngr): Ditto.
* tools/gpgtar-create.c (gpgtar_create): Ditto.
* tools/gpgtar-extract.c (gpgtar_extract): Ditto.
* tools/gpgtar-list.c (gpgtar_list): Ditto.
--
GnuPG-bug-id: 7192
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
2024-07-09 02:39:15 +02:00
|
|
|
|
gpgrt_process_release (proc);
|
2007-10-22 21:07:56 +02:00
|
|
|
|
|
2004-01-31 14:58:27 +01:00
|
|
|
|
|
|
|
|
|
/* At this point, we can parse the configuration file. */
|
2020-03-12 10:16:56 +01:00
|
|
|
|
config_name = gc_component[component].option_config_filename;
|
2020-03-05 16:23:52 +01:00
|
|
|
|
if (!config_name)
|
|
|
|
|
gc_error (1, 0, "name of config file for %s is not known\n", pgmname);
|
|
|
|
|
|
2020-03-19 12:43:08 +01:00
|
|
|
|
if (!gnupg_default_homedir_p ())
|
|
|
|
|
{
|
|
|
|
|
/* This is not the default homedir. We need to take an absolute
|
|
|
|
|
* config name for the user config file; gpgrt_argparser
|
|
|
|
|
* fortunately supports this. */
|
|
|
|
|
char *tmp = make_filename (gnupg_homedir (), config_name, NULL);
|
|
|
|
|
twopartconfig_name = xstrconcat (config_name, PATHSEP_S, tmp, NULL);
|
|
|
|
|
xfree (tmp);
|
|
|
|
|
config_name = twopartconfig_name;
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-05 16:23:52 +01:00
|
|
|
|
memset (&pargs, 0, sizeof pargs);
|
|
|
|
|
dummy_argc = 0;
|
|
|
|
|
pargs.argc = &dummy_argc;
|
|
|
|
|
pargs.flags = (ARGPARSE_FLAG_KEEP
|
|
|
|
|
| ARGPARSE_FLAG_SYS
|
|
|
|
|
| ARGPARSE_FLAG_USER
|
2020-08-25 11:09:47 +02:00
|
|
|
|
| ARGPARSE_FLAG_WITHATTR);
|
|
|
|
|
if (opt.verbose)
|
|
|
|
|
pargs.flags |= ARGPARSE_FLAG_VERBOSE;
|
2020-03-05 16:23:52 +01:00
|
|
|
|
|
|
|
|
|
while (gpgrt_argparser (&pargs, opt_table, config_name))
|
2004-01-31 14:58:27 +01:00
|
|
|
|
{
|
2020-03-05 16:23:52 +01:00
|
|
|
|
char *opt_value;
|
2004-01-31 14:58:27 +01:00
|
|
|
|
|
2020-03-05 16:23:52 +01:00
|
|
|
|
if (pargs.r_opt == ARGPARSE_CONFFILE)
|
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* log_debug ("current conffile='%s'\n", */
|
|
|
|
|
/* pargs.r_type? pargs.r.ret_str: "[cmdline]"); */
|
2020-03-05 16:23:52 +01:00
|
|
|
|
continue;
|
|
|
|
|
}
|
2022-01-26 12:47:56 +01:00
|
|
|
|
if ((pargs.r_type & ARGPARSE_OPT_IGNORE))
|
|
|
|
|
continue;
|
2004-01-31 14:58:27 +01:00
|
|
|
|
|
2020-03-05 16:23:52 +01:00
|
|
|
|
/* We only have the short option. Search in the option table
|
|
|
|
|
* for the long option name. */
|
|
|
|
|
for (i=0; opt_table[i].short_opt; i++)
|
|
|
|
|
if (opt_table[i].short_opt == pargs.r_opt)
|
|
|
|
|
break;
|
|
|
|
|
if (!opt_table[i].short_opt || !opt_table[i].long_opt)
|
|
|
|
|
continue; /* No or only a short option - ignore. */
|
2004-01-31 14:58:27 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* Look up the option from the config file in our list of
|
|
|
|
|
* supported options. */
|
|
|
|
|
option= find_option (component, opt_table[i].long_opt);
|
2020-03-05 16:23:52 +01:00
|
|
|
|
if (!option)
|
|
|
|
|
continue; /* We don't want to handle this option. */
|
2004-01-31 14:58:27 +01:00
|
|
|
|
|
2021-12-30 10:18:23 +01:00
|
|
|
|
/* Set the force and ignore attributes. The idea is that there
|
|
|
|
|
* is no way to clear them again, thus we set them when first
|
|
|
|
|
* encountered. */
|
|
|
|
|
if ((pargs.r_type & ARGPARSE_ATTR_FORCE))
|
|
|
|
|
option->attr_force = 1;
|
|
|
|
|
if ((pargs.r_type & ARGPARSE_ATTR_IGNORE))
|
|
|
|
|
option->attr_ignore = 1;
|
|
|
|
|
|
|
|
|
|
/* If an option has been ignored, there is no need to return
|
|
|
|
|
* that option with gpgconf --list-options. */
|
|
|
|
|
if (option->attr_ignore)
|
|
|
|
|
continue;
|
2020-03-05 16:23:52 +01:00
|
|
|
|
|
|
|
|
|
switch ((pargs.r_type & ARGPARSE_TYPE_MASK))
|
|
|
|
|
{
|
|
|
|
|
case ARGPARSE_TYPE_INT:
|
|
|
|
|
opt_value = xasprintf ("%d", pargs.r.ret_int);
|
|
|
|
|
break;
|
|
|
|
|
case ARGPARSE_TYPE_LONG:
|
|
|
|
|
opt_value = xasprintf ("%ld", pargs.r.ret_long);
|
|
|
|
|
break;
|
|
|
|
|
case ARGPARSE_TYPE_ULONG:
|
|
|
|
|
opt_value = xasprintf ("%lu", pargs.r.ret_ulong);
|
|
|
|
|
break;
|
|
|
|
|
case ARGPARSE_TYPE_STRING:
|
2022-01-26 12:47:56 +01:00
|
|
|
|
if (!pargs.r.ret_str)
|
|
|
|
|
opt_value = xstrdup ("\"(none)"); /* We should not see this. */
|
|
|
|
|
else
|
|
|
|
|
opt_value = xasprintf ("\"%s", gc_percent_escape (pargs.r.ret_str));
|
2020-03-05 16:23:52 +01:00
|
|
|
|
break;
|
|
|
|
|
default: /* ARGPARSE_TYPE_NONE or any unknown type. */
|
|
|
|
|
opt_value = xstrdup ("1"); /* Make sure we have some value. */
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* Now enter the value read from the config file into the table. */
|
|
|
|
|
if (!option->is_list)
|
2020-03-05 16:23:52 +01:00
|
|
|
|
{
|
|
|
|
|
xfree (option->value);
|
|
|
|
|
option->value = opt_value;
|
|
|
|
|
}
|
2020-03-12 10:16:56 +01:00
|
|
|
|
else if (!option->value) /* LIST but first item. */
|
2020-03-05 16:23:52 +01:00
|
|
|
|
option->value = opt_value;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
char *old = option->value;
|
|
|
|
|
option->value = xstrconcat (old, ",", opt_value, NULL);
|
|
|
|
|
xfree (old);
|
|
|
|
|
xfree (opt_value);
|
|
|
|
|
}
|
2004-01-31 14:58:27 +01:00
|
|
|
|
}
|
|
|
|
|
|
2004-06-14 10:32:07 +02:00
|
|
|
|
xfree (line);
|
2020-03-19 12:43:08 +01:00
|
|
|
|
xfree (twopartconfig_name);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-08-06 13:48:23 +02:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* Retrieve the currently active options and their defaults for this
|
|
|
|
|
component. Using -1 for component will retrieve all options from
|
|
|
|
|
all installed components. */
|
2004-01-29 00:58:18 +01:00
|
|
|
|
void
|
|
|
|
|
gc_component_retrieve_options (int component)
|
|
|
|
|
{
|
2007-03-06 21:44:41 +01:00
|
|
|
|
int process_all = 0;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2007-03-06 21:44:41 +01:00
|
|
|
|
if (component == -1)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2007-03-06 21:44:41 +01:00
|
|
|
|
process_all = 1;
|
|
|
|
|
component = 0;
|
|
|
|
|
}
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2007-03-06 21:44:41 +01:00
|
|
|
|
do
|
|
|
|
|
{
|
2016-12-16 14:25:47 +01:00
|
|
|
|
if (component == GC_COMPONENT_PINENTRY)
|
|
|
|
|
continue; /* Skip this dummy component. */
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (gc_component[component].program)
|
|
|
|
|
retrieve_options_from_program (component, process_all);
|
|
|
|
|
}
|
|
|
|
|
while (process_all && ++component < GC_COMPONENT_NR);
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
}
|
2007-08-29 11:51:37 +02:00
|
|
|
|
|
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2004-02-26 17:28:27 +01:00
|
|
|
|
/* Perform a simple validity check based on the type. Return in
|
2016-12-16 16:00:15 +01:00
|
|
|
|
* NEW_VALUE_NR the value of the number in NEW_VALUE if OPTION is of
|
|
|
|
|
* type GC_ARG_TYPE_NONE. If VERBATIM is set the profile parsing mode
|
|
|
|
|
* is used. */
|
2004-01-29 00:58:18 +01:00
|
|
|
|
static void
|
2020-03-12 10:16:56 +01:00
|
|
|
|
option_check_validity (gc_component_id_t component,
|
|
|
|
|
gc_option_t *option, unsigned long flags,
|
2016-12-16 16:00:15 +01:00
|
|
|
|
char *new_value, unsigned long *new_value_nr,
|
|
|
|
|
int verbatim)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2004-02-26 19:22:02 +01:00
|
|
|
|
char *arg;
|
|
|
|
|
|
2020-03-14 18:53:43 +01:00
|
|
|
|
(void)component;
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2004-02-25 21:24:53 +01:00
|
|
|
|
if (option->new_flags || option->new_value)
|
2004-01-30 13:15:53 +01:00
|
|
|
|
gc_error (1, 0, "option %s already changed", option->name);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2004-02-26 17:28:27 +01:00
|
|
|
|
if (flags & GC_OPT_FLAG_DEFAULT)
|
|
|
|
|
{
|
|
|
|
|
if (*new_value)
|
|
|
|
|
gc_error (1, 0, "argument %s provided for deleted option %s",
|
|
|
|
|
new_value, option->name);
|
2004-02-26 19:22:02 +01:00
|
|
|
|
|
|
|
|
|
return;
|
2004-02-26 17:28:27 +01:00
|
|
|
|
}
|
2004-02-26 19:22:02 +01:00
|
|
|
|
|
|
|
|
|
/* GC_ARG_TYPE_NONE options have special list treatment. */
|
|
|
|
|
if (gc_arg_type[option->arg_type].fallback == GC_ARG_TYPE_NONE)
|
2004-02-26 17:28:27 +01:00
|
|
|
|
{
|
2004-02-26 19:22:02 +01:00
|
|
|
|
char *tail;
|
2004-02-26 17:28:27 +01:00
|
|
|
|
|
2010-03-29 14:57:11 +02:00
|
|
|
|
gpg_err_set_errno (0);
|
2004-02-26 19:22:02 +01:00
|
|
|
|
*new_value_nr = strtoul (new_value, &tail, 0);
|
|
|
|
|
|
|
|
|
|
if (errno)
|
|
|
|
|
gc_error (1, errno, "invalid argument for option %s",
|
|
|
|
|
option->name);
|
|
|
|
|
if (*tail)
|
|
|
|
|
gc_error (1, 0, "garbage after argument for option %s",
|
|
|
|
|
option->name);
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (!option->is_list)
|
2004-02-26 17:28:27 +01:00
|
|
|
|
{
|
2004-02-26 19:22:02 +01:00
|
|
|
|
if (*new_value_nr != 1)
|
|
|
|
|
gc_error (1, 0, "argument for non-list option %s of type 0 "
|
|
|
|
|
"(none) must be 1", option->name);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
if (*new_value_nr == 0)
|
|
|
|
|
gc_error (1, 0, "argument for option %s of type 0 (none) "
|
|
|
|
|
"must be positive", option->name);
|
|
|
|
|
}
|
2004-02-26 17:28:27 +01:00
|
|
|
|
|
2004-02-26 19:22:02 +01:00
|
|
|
|
return;
|
|
|
|
|
}
|
2004-02-26 17:28:27 +01:00
|
|
|
|
|
2004-02-26 19:22:02 +01:00
|
|
|
|
arg = new_value;
|
|
|
|
|
do
|
|
|
|
|
{
|
2016-12-16 16:00:15 +01:00
|
|
|
|
if (*arg == '\0' || (*arg == ',' && !verbatim))
|
2004-02-26 19:22:02 +01:00
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (!option->opt_arg)
|
2004-02-26 19:22:02 +01:00
|
|
|
|
gc_error (1, 0, "argument required for option %s", option->name);
|
2004-02-26 17:28:27 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (*arg == ',' && !verbatim && !option->is_list)
|
2004-02-26 19:22:02 +01:00
|
|
|
|
gc_error (1, 0, "list found for non-list option %s", option->name);
|
|
|
|
|
}
|
|
|
|
|
else if (gc_arg_type[option->arg_type].fallback == GC_ARG_TYPE_STRING)
|
|
|
|
|
{
|
2016-12-16 16:00:15 +01:00
|
|
|
|
if (*arg != '"' && !verbatim)
|
2004-02-26 19:22:02 +01:00
|
|
|
|
gc_error (1, 0, "string argument for option %s must begin "
|
|
|
|
|
"with a quote (\") character", option->name);
|
2008-02-27 18:32:47 +01:00
|
|
|
|
|
|
|
|
|
/* FIXME: We do not allow empty string arguments for now, as
|
|
|
|
|
we do not quote arguments in configuration files, and
|
|
|
|
|
thus no argument is indistinguishable from the empty
|
|
|
|
|
string. */
|
2016-12-16 16:00:15 +01:00
|
|
|
|
if (arg[1] == '\0' || (arg[1] == ',' && !verbatim))
|
2008-02-27 18:32:47 +01:00
|
|
|
|
gc_error (1, 0, "empty string argument for option %s is "
|
|
|
|
|
"currently not allowed. Please report this!",
|
|
|
|
|
option->name);
|
2004-02-26 19:22:02 +01:00
|
|
|
|
}
|
|
|
|
|
else if (gc_arg_type[option->arg_type].fallback == GC_ARG_TYPE_INT32)
|
|
|
|
|
{
|
2010-04-20 03:11:35 +02:00
|
|
|
|
long res;
|
|
|
|
|
|
2010-03-29 14:57:11 +02:00
|
|
|
|
gpg_err_set_errno (0);
|
2010-04-20 03:11:35 +02:00
|
|
|
|
res = strtol (arg, &arg, 0);
|
|
|
|
|
(void) res;
|
2004-02-26 17:28:27 +01:00
|
|
|
|
|
2004-02-26 19:22:02 +01:00
|
|
|
|
if (errno)
|
|
|
|
|
gc_error (1, errno, "invalid argument for option %s",
|
|
|
|
|
option->name);
|
2004-02-25 21:24:53 +01:00
|
|
|
|
|
2016-12-16 16:00:15 +01:00
|
|
|
|
if (*arg != '\0' && (*arg != ',' || verbatim))
|
2004-02-26 19:22:02 +01:00
|
|
|
|
gc_error (1, 0, "garbage after argument for option %s",
|
|
|
|
|
option->name);
|
|
|
|
|
}
|
2015-01-23 15:37:51 +01:00
|
|
|
|
else if (gc_arg_type[option->arg_type].fallback == GC_ARG_TYPE_UINT32)
|
2004-02-26 19:22:02 +01:00
|
|
|
|
{
|
2010-04-20 03:11:35 +02:00
|
|
|
|
unsigned long res;
|
|
|
|
|
|
2010-03-29 14:57:11 +02:00
|
|
|
|
gpg_err_set_errno (0);
|
2010-04-20 03:11:35 +02:00
|
|
|
|
res = strtoul (arg, &arg, 0);
|
|
|
|
|
(void) res;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2004-02-26 19:22:02 +01:00
|
|
|
|
if (errno)
|
|
|
|
|
gc_error (1, errno, "invalid argument for option %s",
|
|
|
|
|
option->name);
|
2004-02-26 17:28:27 +01:00
|
|
|
|
|
2016-12-16 16:00:15 +01:00
|
|
|
|
if (*arg != '\0' && (*arg != ',' || verbatim))
|
2004-02-26 19:22:02 +01:00
|
|
|
|
gc_error (1, 0, "garbage after argument for option %s",
|
|
|
|
|
option->name);
|
2004-02-26 17:28:27 +01:00
|
|
|
|
}
|
2016-12-16 16:00:15 +01:00
|
|
|
|
arg = verbatim? strchr (arg, ',') : NULL;
|
2004-02-26 19:22:02 +01:00
|
|
|
|
if (arg)
|
|
|
|
|
arg++;
|
2004-02-26 17:28:27 +01:00
|
|
|
|
}
|
2004-02-26 19:22:02 +01:00
|
|
|
|
while (arg && *arg);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
}
|
|
|
|
|
|
2007-06-15 16:46:23 +02:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
int
|
|
|
|
|
copy_file (const char *src_name, const char *dst_name)
|
|
|
|
|
{
|
|
|
|
|
#define BUF_LEN 4096
|
|
|
|
|
char buffer[BUF_LEN];
|
|
|
|
|
int len;
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_stream_t src;
|
|
|
|
|
gpgrt_stream_t dst;
|
2007-06-15 16:46:23 +02:00
|
|
|
|
|
2017-01-24 15:06:43 +01:00
|
|
|
|
src = gpgrt_fopen (src_name, "r");
|
2007-06-15 16:46:23 +02:00
|
|
|
|
if (src == NULL)
|
|
|
|
|
return -1;
|
|
|
|
|
|
2017-01-24 15:06:43 +01:00
|
|
|
|
dst = gpgrt_fopen (dst_name, "w");
|
2007-06-15 16:46:23 +02:00
|
|
|
|
if (dst == NULL)
|
|
|
|
|
{
|
|
|
|
|
int saved_err = errno;
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_fclose (src);
|
2010-03-29 14:57:11 +02:00
|
|
|
|
gpg_err_set_errno (saved_err);
|
2007-06-15 16:46:23 +02:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
int written;
|
|
|
|
|
|
2017-01-24 15:06:43 +01:00
|
|
|
|
len = gpgrt_fread (buffer, 1, BUF_LEN, src);
|
2007-06-15 16:46:23 +02:00
|
|
|
|
if (len == 0)
|
|
|
|
|
break;
|
2017-01-24 15:06:43 +01:00
|
|
|
|
written = gpgrt_fwrite (buffer, 1, len, dst);
|
2007-06-15 16:46:23 +02:00
|
|
|
|
if (written != len)
|
|
|
|
|
break;
|
|
|
|
|
}
|
2017-01-24 15:06:43 +01:00
|
|
|
|
while (! gpgrt_feof (src) && ! gpgrt_ferror (src) && ! gpgrt_ferror (dst));
|
2007-06-15 16:46:23 +02:00
|
|
|
|
|
2017-01-24 15:06:43 +01:00
|
|
|
|
if (gpgrt_ferror (src) || gpgrt_ferror (dst) || ! gpgrt_feof (src))
|
2007-06-15 16:46:23 +02:00
|
|
|
|
{
|
2007-06-18 22:07:33 +02:00
|
|
|
|
int saved_errno = errno;
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_fclose (src);
|
|
|
|
|
gpgrt_fclose (dst);
|
2007-06-15 16:46:23 +02:00
|
|
|
|
unlink (dst_name);
|
2010-03-29 14:57:11 +02:00
|
|
|
|
gpg_err_set_errno (saved_errno);
|
2007-06-15 16:46:23 +02:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-24 15:06:43 +01:00
|
|
|
|
if (gpgrt_fclose (dst))
|
2007-06-18 22:07:33 +02:00
|
|
|
|
gc_error (1, errno, "error closing %s", dst_name);
|
2017-01-24 15:06:43 +01:00
|
|
|
|
if (gpgrt_fclose (src))
|
2007-06-18 22:07:33 +02:00
|
|
|
|
gc_error (1, errno, "error closing %s", src_name);
|
|
|
|
|
|
2007-06-15 16:46:23 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#endif /* HAVE_W32_SYSTEM */
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2007-06-18 22:07:33 +02:00
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
/* Create and verify the new configuration file for the specified
|
2020-03-12 10:16:56 +01:00
|
|
|
|
* component. Returns 0 on success and -1 on error. If
|
2017-01-24 12:57:43 +01:00
|
|
|
|
* VERBATIM is set the profile mode is used. This function may store
|
|
|
|
|
* pointers to malloced strings in SRC_FILENAMEP, DEST_FILENAMEP, and
|
|
|
|
|
* ORIG_FILENAMEP. Those must be freed by the caller. The strings
|
|
|
|
|
* refer to three versions of the configuration file:
|
|
|
|
|
*
|
|
|
|
|
* SRC_FILENAME: The updated configuration is written to this file.
|
|
|
|
|
* DEST_FILENAME: Name of the configuration file read by the
|
|
|
|
|
* component.
|
|
|
|
|
* ORIG_FILENAME: A backup of the previous configuration file.
|
|
|
|
|
*
|
|
|
|
|
* To apply the configuration change, rename SRC_FILENAME to
|
|
|
|
|
* DEST_FILENAME. To revert to the previous configuration, rename
|
|
|
|
|
* ORIG_FILENAME to DEST_FILENAME. */
|
2004-01-29 00:58:18 +01:00
|
|
|
|
static int
|
2020-03-12 10:16:56 +01:00
|
|
|
|
change_options_program (gc_component_id_t component,
|
2004-01-29 00:58:18 +01:00
|
|
|
|
char **src_filenamep, char **dest_filenamep,
|
2016-12-16 16:00:15 +01:00
|
|
|
|
char **orig_filenamep,
|
|
|
|
|
int verbatim)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2014-05-07 18:18:27 +02:00
|
|
|
|
static const char marker[] = "###+++--- " GPGCONF_DISP_NAME " ---+++###";
|
2004-01-29 00:58:18 +01:00
|
|
|
|
/* True if we are within the marker in the config file. */
|
|
|
|
|
int in_marker = 0;
|
|
|
|
|
gc_option_t *option;
|
2004-01-31 14:58:27 +01:00
|
|
|
|
char *line = NULL;
|
2004-01-30 11:38:07 +01:00
|
|
|
|
size_t line_len;
|
|
|
|
|
ssize_t length;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
int res;
|
|
|
|
|
int fd;
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_stream_t src_file = NULL;
|
|
|
|
|
gpgrt_stream_t dest_file = NULL;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
char *src_filename;
|
|
|
|
|
char *dest_filename;
|
|
|
|
|
char *orig_filename;
|
2008-01-17 23:42:58 +01:00
|
|
|
|
/* Special hack for gpg, see below. */
|
|
|
|
|
int utf8strings_seen = 0;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
/* FIXME. Throughout the function, do better error reporting. */
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (!gc_component[component].option_config_filename)
|
|
|
|
|
gc_error (1, 0, "name of config file for %s is not known\n",
|
|
|
|
|
gc_component[component].name);
|
|
|
|
|
|
|
|
|
|
dest_filename = make_absfilename
|
|
|
|
|
(gnupg_homedir (), gc_component[component].option_config_filename, NULL);
|
2014-05-07 18:18:27 +02:00
|
|
|
|
src_filename = xasprintf ("%s.%s.%i.new",
|
|
|
|
|
dest_filename, GPGCONF_NAME, (int)getpid ());
|
|
|
|
|
orig_filename = xasprintf ("%s.%s.%i.bak",
|
|
|
|
|
dest_filename, GPGCONF_NAME, (int)getpid ());
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2007-06-15 16:46:23 +02:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
res = copy_file (dest_filename, orig_filename);
|
2004-12-15 15:15:54 +01:00
|
|
|
|
#else
|
2004-01-29 00:58:18 +01:00
|
|
|
|
res = link (dest_filename, orig_filename);
|
2004-12-15 15:15:54 +01:00
|
|
|
|
#endif
|
2004-01-29 00:58:18 +01:00
|
|
|
|
if (res < 0 && errno != ENOENT)
|
2017-01-10 15:42:27 +01:00
|
|
|
|
{
|
|
|
|
|
xfree (dest_filename);
|
|
|
|
|
xfree (src_filename);
|
|
|
|
|
xfree (orig_filename);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2004-01-29 00:58:18 +01:00
|
|
|
|
if (res < 0)
|
|
|
|
|
{
|
2004-01-31 14:58:27 +01:00
|
|
|
|
xfree (orig_filename);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
orig_filename = NULL;
|
|
|
|
|
}
|
2004-02-26 19:22:02 +01:00
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
/* We now initialize the return strings, so the caller can do the
|
|
|
|
|
cleanup for us. */
|
|
|
|
|
*src_filenamep = src_filename;
|
|
|
|
|
*dest_filenamep = dest_filename;
|
|
|
|
|
*orig_filenamep = orig_filename;
|
|
|
|
|
|
2020-10-20 14:08:35 +02:00
|
|
|
|
/* Use open() so that we can use O_EXCL.
|
|
|
|
|
* FIXME: gpgrt has an x flag for quite some time now - use that. */
|
|
|
|
|
fd = gnupg_open (src_filename, O_CREAT | O_EXCL | O_WRONLY, 0644);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
if (fd < 0)
|
|
|
|
|
return -1;
|
2017-01-24 15:06:43 +01:00
|
|
|
|
src_file = gpgrt_fdopen (fd, "w");
|
2004-01-29 00:58:18 +01:00
|
|
|
|
res = errno;
|
|
|
|
|
if (!src_file)
|
|
|
|
|
{
|
2010-03-29 14:57:11 +02:00
|
|
|
|
gpg_err_set_errno (res);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Only if ORIG_FILENAME is not NULL did the configuration file
|
|
|
|
|
exist already. In this case, we will copy its content into the
|
|
|
|
|
new configuration file, changing it to our liking in the
|
|
|
|
|
process. */
|
|
|
|
|
if (orig_filename)
|
|
|
|
|
{
|
2017-01-24 15:06:43 +01:00
|
|
|
|
dest_file = gpgrt_fopen (dest_filename, "r");
|
2004-01-29 00:58:18 +01:00
|
|
|
|
if (!dest_file)
|
|
|
|
|
goto change_one_err;
|
|
|
|
|
|
2017-01-24 15:06:43 +01:00
|
|
|
|
while ((length = gpgrt_read_line (dest_file, &line, &line_len, NULL)) > 0)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
|
|
|
|
int disable = 0;
|
|
|
|
|
char *start;
|
|
|
|
|
|
|
|
|
|
if (!strncmp (marker, line, sizeof (marker) - 1))
|
|
|
|
|
{
|
|
|
|
|
if (!in_marker)
|
|
|
|
|
in_marker = 1;
|
|
|
|
|
else
|
|
|
|
|
break;
|
|
|
|
|
}
|
2020-03-12 10:16:56 +01:00
|
|
|
|
else if (component == GC_COMPONENT_GPG && in_marker
|
2008-01-17 23:42:58 +01:00
|
|
|
|
&& ! strcmp ("utf8-strings\n", line))
|
|
|
|
|
{
|
|
|
|
|
/* Strip duplicated entries. */
|
|
|
|
|
if (utf8strings_seen)
|
|
|
|
|
disable = 1;
|
|
|
|
|
else
|
|
|
|
|
utf8strings_seen = 1;
|
|
|
|
|
}
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
|
|
|
|
start = line;
|
|
|
|
|
while (*start == ' ' || *start == '\t')
|
|
|
|
|
start++;
|
|
|
|
|
if (*start && *start != '\r' && *start != '\n' && *start != '#')
|
|
|
|
|
{
|
2004-02-26 23:18:36 +01:00
|
|
|
|
char *end;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
char saved_end;
|
|
|
|
|
|
|
|
|
|
end = start;
|
|
|
|
|
while (*end && *end != ' ' && *end != '\t'
|
|
|
|
|
&& *end != '\r' && *end != '\n' && *end != '#')
|
|
|
|
|
end++;
|
|
|
|
|
saved_end = *end;
|
|
|
|
|
*end = '\0';
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
option = find_option (component, start);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
*end = saved_end;
|
2004-02-26 17:28:27 +01:00
|
|
|
|
if (option && ((option->new_flags & GC_OPT_FLAG_DEFAULT)
|
|
|
|
|
|| option->new_value))
|
2004-01-29 00:58:18 +01:00
|
|
|
|
disable = 1;
|
|
|
|
|
}
|
|
|
|
|
if (disable)
|
|
|
|
|
{
|
|
|
|
|
if (!in_marker)
|
|
|
|
|
{
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_fprintf (src_file,
|
2014-05-07 18:18:27 +02:00
|
|
|
|
"# %s disabled this option here at %s\n",
|
|
|
|
|
GPGCONF_DISP_NAME, asctimestamp (gnupg_get_time ()));
|
2017-01-24 15:06:43 +01:00
|
|
|
|
if (gpgrt_ferror (src_file))
|
2004-01-29 00:58:18 +01:00
|
|
|
|
goto change_one_err;
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_fprintf (src_file, "# %s", line);
|
|
|
|
|
if (gpgrt_ferror (src_file))
|
2004-01-29 00:58:18 +01:00
|
|
|
|
goto change_one_err;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_fprintf (src_file, "%s", line);
|
|
|
|
|
if (gpgrt_ferror (src_file))
|
2004-01-29 00:58:18 +01:00
|
|
|
|
goto change_one_err;
|
|
|
|
|
}
|
|
|
|
|
}
|
2017-01-24 15:06:43 +01:00
|
|
|
|
if (length < 0 || gpgrt_ferror (dest_file))
|
2004-01-29 00:58:18 +01:00
|
|
|
|
goto change_one_err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!in_marker)
|
|
|
|
|
{
|
|
|
|
|
/* There was no marker. This is the first time we edit the
|
|
|
|
|
file. We add our own marker at the end of the file and
|
|
|
|
|
proceed. Note that we first write a newline, this guards us
|
|
|
|
|
against files which lack the newline at the end of the last
|
|
|
|
|
line, while it doesn't hurt us in all other cases. */
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_fprintf (src_file, "\n%s\n", marker);
|
|
|
|
|
if (gpgrt_ferror (src_file))
|
2004-01-29 00:58:18 +01:00
|
|
|
|
goto change_one_err;
|
|
|
|
|
}
|
|
|
|
|
/* At this point, we have copied everything up to the end marker
|
|
|
|
|
into the new file, except for the options we are going to change.
|
|
|
|
|
Now, dump the changed options (except for those we are going to
|
|
|
|
|
revert to their default), and write the end marker, possibly
|
|
|
|
|
followed by the rest of the original file. */
|
2004-04-29 21:00:37 +02:00
|
|
|
|
|
|
|
|
|
/* We have to turn on UTF8 strings for GnuPG. */
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (component == GC_COMPONENT_GPG && ! utf8strings_seen)
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_fprintf (src_file, "utf8-strings\n");
|
2004-04-29 21:00:37 +02:00
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
option = gc_component[component].options;
|
2020-03-12 10:16:56 +01:00
|
|
|
|
for ( ; option->name; option++)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (!option->is_header && option->new_value)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2004-02-26 19:39:34 +01:00
|
|
|
|
char *arg = option->new_value;
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
if (*arg == '\0' || *arg == ',')
|
|
|
|
|
{
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_fprintf (src_file, "%s\n", option->name);
|
|
|
|
|
if (gpgrt_ferror (src_file))
|
2004-02-26 19:39:34 +01:00
|
|
|
|
goto change_one_err;
|
|
|
|
|
}
|
|
|
|
|
else if (gc_arg_type[option->arg_type].fallback
|
|
|
|
|
== GC_ARG_TYPE_NONE)
|
|
|
|
|
{
|
2020-03-03 14:17:24 +01:00
|
|
|
|
log_assert (*arg == '1');
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_fprintf (src_file, "%s\n", option->name);
|
|
|
|
|
if (gpgrt_ferror (src_file))
|
2004-02-26 19:39:34 +01:00
|
|
|
|
goto change_one_err;
|
|
|
|
|
|
|
|
|
|
arg++;
|
|
|
|
|
}
|
|
|
|
|
else if (gc_arg_type[option->arg_type].fallback
|
|
|
|
|
== GC_ARG_TYPE_STRING)
|
|
|
|
|
{
|
|
|
|
|
char *end;
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2016-12-16 16:00:15 +01:00
|
|
|
|
if (!verbatim)
|
|
|
|
|
{
|
|
|
|
|
log_assert (*arg == '"');
|
|
|
|
|
arg++;
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2016-12-16 16:00:15 +01:00
|
|
|
|
end = strchr (arg, ',');
|
|
|
|
|
if (end)
|
|
|
|
|
*end = '\0';
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
end = NULL;
|
2004-02-26 19:39:34 +01:00
|
|
|
|
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_fprintf (src_file, "%s %s\n", option->name,
|
2016-12-16 16:00:15 +01:00
|
|
|
|
verbatim? arg : percent_deescape (arg));
|
2017-01-24 15:06:43 +01:00
|
|
|
|
if (gpgrt_ferror (src_file))
|
2004-02-26 19:39:34 +01:00
|
|
|
|
goto change_one_err;
|
|
|
|
|
|
|
|
|
|
if (end)
|
|
|
|
|
*end = ',';
|
|
|
|
|
arg = end;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
char *end;
|
|
|
|
|
|
|
|
|
|
end = strchr (arg, ',');
|
|
|
|
|
if (end)
|
|
|
|
|
*end = '\0';
|
|
|
|
|
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_fprintf (src_file, "%s %s\n", option->name, arg);
|
|
|
|
|
if (gpgrt_ferror (src_file))
|
2004-02-26 19:39:34 +01:00
|
|
|
|
goto change_one_err;
|
|
|
|
|
|
|
|
|
|
if (end)
|
|
|
|
|
*end = ',';
|
|
|
|
|
arg = end;
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-03 14:17:24 +01:00
|
|
|
|
log_assert (arg == NULL || *arg == '\0' || *arg == ',');
|
2004-02-26 19:39:34 +01:00
|
|
|
|
if (arg && *arg == ',')
|
|
|
|
|
arg++;
|
|
|
|
|
}
|
|
|
|
|
while (arg && *arg);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
2004-02-23 20:37:04 +01:00
|
|
|
|
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_fprintf (src_file, "%s %s\n", marker, asctimestamp (gnupg_get_time ()));
|
|
|
|
|
if (gpgrt_ferror (src_file))
|
2004-02-23 20:37:04 +01:00
|
|
|
|
goto change_one_err;
|
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
if (!in_marker)
|
|
|
|
|
{
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_fprintf (src_file, "# %s edited this configuration file.\n",
|
2014-05-07 18:18:27 +02:00
|
|
|
|
GPGCONF_DISP_NAME);
|
2017-01-24 15:06:43 +01:00
|
|
|
|
if (gpgrt_ferror (src_file))
|
2004-01-29 00:58:18 +01:00
|
|
|
|
goto change_one_err;
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_fprintf (src_file, "# It will disable options before this marked "
|
2004-01-29 00:58:18 +01:00
|
|
|
|
"block, but it will\n");
|
2017-01-24 15:06:43 +01:00
|
|
|
|
if (gpgrt_ferror (src_file))
|
2004-01-29 00:58:18 +01:00
|
|
|
|
goto change_one_err;
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_fprintf (src_file, "# never change anything below these lines.\n");
|
|
|
|
|
if (gpgrt_ferror (src_file))
|
2004-01-29 00:58:18 +01:00
|
|
|
|
goto change_one_err;
|
|
|
|
|
}
|
|
|
|
|
if (dest_file)
|
|
|
|
|
{
|
2017-01-24 15:06:43 +01:00
|
|
|
|
while ((length = gpgrt_read_line (dest_file, &line, &line_len, NULL)) > 0)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_fprintf (src_file, "%s", line);
|
|
|
|
|
if (gpgrt_ferror (src_file))
|
2004-01-29 00:58:18 +01:00
|
|
|
|
goto change_one_err;
|
|
|
|
|
}
|
2017-01-24 15:06:43 +01:00
|
|
|
|
if (length < 0 || gpgrt_ferror (dest_file))
|
2004-01-29 00:58:18 +01:00
|
|
|
|
goto change_one_err;
|
|
|
|
|
}
|
2004-06-14 10:32:07 +02:00
|
|
|
|
xfree (line);
|
|
|
|
|
line = NULL;
|
|
|
|
|
|
2017-01-24 15:06:43 +01:00
|
|
|
|
res = gpgrt_fclose (src_file);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
if (res)
|
|
|
|
|
{
|
|
|
|
|
res = errno;
|
|
|
|
|
close (fd);
|
|
|
|
|
if (dest_file)
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_fclose (dest_file);
|
2010-03-29 14:57:11 +02:00
|
|
|
|
gpg_err_set_errno (res);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
close (fd);
|
|
|
|
|
if (dest_file)
|
|
|
|
|
{
|
2017-01-24 15:06:43 +01:00
|
|
|
|
res = gpgrt_fclose (dest_file);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
if (res)
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
change_one_err:
|
2004-06-14 10:32:07 +02:00
|
|
|
|
xfree (line);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
res = errno;
|
|
|
|
|
if (src_file)
|
|
|
|
|
{
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_fclose (src_file);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
close (fd);
|
|
|
|
|
}
|
|
|
|
|
if (dest_file)
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_fclose (dest_file);
|
2010-03-29 14:57:11 +02:00
|
|
|
|
gpg_err_set_errno (res);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2004-02-26 17:28:27 +01:00
|
|
|
|
|
2007-03-06 21:44:41 +01:00
|
|
|
|
/* Common code for gc_component_change_options and
|
2016-12-16 16:00:15 +01:00
|
|
|
|
* gc_process_gpgconf_conf. If VERBATIM is set the profile parsing
|
|
|
|
|
* mode is used. */
|
2007-03-06 21:44:41 +01:00
|
|
|
|
static void
|
2020-03-12 10:16:56 +01:00
|
|
|
|
change_one_value (gc_component_id_t component,
|
|
|
|
|
gc_option_t *option, int *r_runtime,
|
2016-12-16 16:00:15 +01:00
|
|
|
|
unsigned long flags, char *new_value, int verbatim)
|
2007-03-06 21:44:41 +01:00
|
|
|
|
{
|
|
|
|
|
unsigned long new_value_nr = 0;
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
option_check_validity (component, option,
|
|
|
|
|
flags, new_value, &new_value_nr, verbatim);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (option->runtime)
|
|
|
|
|
*r_runtime = 1;
|
2007-03-06 21:44:41 +01:00
|
|
|
|
|
|
|
|
|
option->new_flags = flags;
|
|
|
|
|
if (!(flags & GC_OPT_FLAG_DEFAULT))
|
|
|
|
|
{
|
|
|
|
|
if (gc_arg_type[option->arg_type].fallback == GC_ARG_TYPE_NONE
|
2020-03-12 10:16:56 +01:00
|
|
|
|
&& option->is_list)
|
2007-03-06 21:44:41 +01:00
|
|
|
|
{
|
|
|
|
|
char *str;
|
|
|
|
|
|
|
|
|
|
/* We convert the number to a list of 1's for convenient
|
|
|
|
|
list handling. */
|
2020-03-03 14:17:24 +01:00
|
|
|
|
log_assert (new_value_nr > 0);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
option->new_value = xmalloc ((2 * (new_value_nr - 1) + 1) + 1);
|
|
|
|
|
str = option->new_value;
|
|
|
|
|
*(str++) = '1';
|
|
|
|
|
while (--new_value_nr > 0)
|
|
|
|
|
{
|
|
|
|
|
*(str++) = ',';
|
|
|
|
|
*(str++) = '1';
|
|
|
|
|
}
|
|
|
|
|
*(str++) = '\0';
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
option->new_value = xstrdup (new_value);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Read the modifications from IN and apply them. If IN is NULL the
|
|
|
|
|
modifications are expected to already have been set to the global
|
2016-12-16 16:00:15 +01:00
|
|
|
|
table. If VERBATIM is set the profile mode is used. */
|
2004-01-29 00:58:18 +01:00
|
|
|
|
void
|
2016-12-16 16:00:15 +01:00
|
|
|
|
gc_component_change_options (int component, estream_t in, estream_t out,
|
|
|
|
|
int verbatim)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
|
|
|
|
int err = 0;
|
2017-01-23 14:26:00 +01:00
|
|
|
|
int block = 0;
|
2020-03-12 10:16:56 +01:00
|
|
|
|
int runtime = 0;
|
|
|
|
|
char *src_filename = NULL;
|
|
|
|
|
char *dest_filename = NULL;
|
|
|
|
|
char *orig_filename = NULL;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
gc_option_t *option;
|
|
|
|
|
char *line = NULL;
|
|
|
|
|
size_t line_len = 0;
|
|
|
|
|
ssize_t length;
|
|
|
|
|
|
2010-08-19 11:53:55 +02:00
|
|
|
|
if (component == GC_COMPONENT_PINENTRY)
|
|
|
|
|
return; /* Dummy component for now. */
|
|
|
|
|
|
2007-03-06 21:44:41 +01:00
|
|
|
|
if (in)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2007-03-06 21:44:41 +01:00
|
|
|
|
/* Read options from the file IN. */
|
2010-08-18 21:25:15 +02:00
|
|
|
|
while ((length = es_read_line (in, &line, &line_len, NULL)) > 0)
|
2007-03-06 21:44:41 +01:00
|
|
|
|
{
|
|
|
|
|
char *linep;
|
|
|
|
|
unsigned long flags = 0;
|
|
|
|
|
char *new_value = "";
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2007-03-06 21:44:41 +01:00
|
|
|
|
/* Strip newline and carriage return, if present. */
|
|
|
|
|
while (length > 0
|
|
|
|
|
&& (line[length - 1] == '\n' || line[length - 1] == '\r'))
|
|
|
|
|
line[--length] = '\0';
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2007-03-06 21:44:41 +01:00
|
|
|
|
linep = strchr (line, ':');
|
|
|
|
|
if (linep)
|
|
|
|
|
*(linep++) = '\0';
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2007-03-06 21:44:41 +01:00
|
|
|
|
/* Extract additional flags. Default to none. */
|
|
|
|
|
if (linep)
|
|
|
|
|
{
|
|
|
|
|
char *end;
|
|
|
|
|
char *tail;
|
|
|
|
|
|
|
|
|
|
end = strchr (linep, ':');
|
|
|
|
|
if (end)
|
|
|
|
|
*(end++) = '\0';
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2010-03-29 14:57:11 +02:00
|
|
|
|
gpg_err_set_errno (0);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
flags = strtoul (linep, &tail, 0);
|
|
|
|
|
if (errno)
|
|
|
|
|
gc_error (1, errno, "malformed flags in option %s", line);
|
|
|
|
|
if (!(*tail == '\0' || *tail == ':' || *tail == ' '))
|
|
|
|
|
gc_error (1, 0, "garbage after flags in option %s", line);
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2007-03-06 21:44:41 +01:00
|
|
|
|
linep = end;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Don't allow setting of the no change flag. */
|
|
|
|
|
flags &= ~GC_OPT_FLAG_NO_CHANGE;
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2007-03-06 21:44:41 +01:00
|
|
|
|
/* Extract default value, if present. Default to empty if not. */
|
|
|
|
|
if (linep)
|
|
|
|
|
{
|
|
|
|
|
char *end;
|
|
|
|
|
end = strchr (linep, ':');
|
|
|
|
|
if (end)
|
|
|
|
|
*(end++) = '\0';
|
|
|
|
|
new_value = linep;
|
|
|
|
|
linep = end;
|
|
|
|
|
}
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
option = find_option (component, line);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
if (!option)
|
|
|
|
|
gc_error (1, 0, "unknown option %s", line);
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (option->no_change)
|
2007-03-06 21:44:41 +01:00
|
|
|
|
{
|
|
|
|
|
gc_error (0, 0, "ignoring new value for option %s",
|
|
|
|
|
option->name);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
change_one_value (component, option, &runtime, flags, new_value, 0);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
}
|
2017-01-23 14:24:22 +01:00
|
|
|
|
if (length < 0 || gpgrt_ferror (in))
|
|
|
|
|
gc_error (1, errno, "error reading stream 'in'");
|
2004-01-29 00:58:18 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now that we have collected and locally verified the changes,
|
|
|
|
|
write them out to new configuration files, verify them
|
|
|
|
|
externally, and then commit them. */
|
|
|
|
|
option = gc_component[component].options;
|
2007-06-26 15:48:44 +02:00
|
|
|
|
while (option && option->name)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* Go on if there is nothing to do. */
|
|
|
|
|
if (src_filename || !(option->new_flags || option->new_value))
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
|
|
|
|
option++;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (gc_component[component].program)
|
2008-05-20 00:46:41 +02:00
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
err = change_options_program (component,
|
|
|
|
|
&src_filename,
|
|
|
|
|
&dest_filename,
|
|
|
|
|
&orig_filename,
|
2016-12-16 16:00:15 +01:00
|
|
|
|
verbatim);
|
2008-05-20 00:46:41 +02:00
|
|
|
|
if (! err)
|
|
|
|
|
{
|
|
|
|
|
/* External verification. */
|
2020-03-12 10:16:56 +01:00
|
|
|
|
err = gc_component_check_options (component, out, src_filename);
|
2008-05-20 00:46:41 +02:00
|
|
|
|
if (err)
|
|
|
|
|
{
|
|
|
|
|
gc_error (0, 0,
|
|
|
|
|
_("External verification of component %s failed"),
|
|
|
|
|
gc_component[component].name);
|
2010-03-29 14:57:11 +02:00
|
|
|
|
gpg_err_set_errno (EINVAL);
|
2008-05-20 00:46:41 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
2004-01-29 00:58:18 +01:00
|
|
|
|
if (err)
|
|
|
|
|
break;
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2004-01-29 00:58:18 +01:00
|
|
|
|
option++;
|
|
|
|
|
}
|
2004-02-26 19:39:34 +01:00
|
|
|
|
|
2017-01-23 14:26:00 +01:00
|
|
|
|
/* We are trying to atomically commit all changes. Unfortunately,
|
|
|
|
|
we cannot rely on gnupg_rename_file to manage the signals for us,
|
|
|
|
|
doing so would require us to pass NULL as BLOCK to any subsequent
|
|
|
|
|
call to it. Instead, we just manage the signal handling
|
|
|
|
|
manually. */
|
|
|
|
|
block = 1;
|
|
|
|
|
gnupg_block_all_signals ();
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (!err && !opt.dry_run)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (src_filename)
|
|
|
|
|
{
|
|
|
|
|
/* FIXME: Make a verification here. */
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
log_assert (dest_filename);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (orig_filename)
|
|
|
|
|
err = gnupg_rename_file (src_filename, dest_filename, NULL);
|
|
|
|
|
else
|
|
|
|
|
{
|
2004-12-15 15:15:54 +01:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* We skip the unlink if we expect the file not to be
|
|
|
|
|
* there. */
|
|
|
|
|
err = gnupg_rename_file (src_filename, dest_filename, NULL);
|
2007-06-15 16:46:23 +02:00
|
|
|
|
#else /* HAVE_W32_SYSTEM */
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* This is a bit safer than rename() because we expect
|
|
|
|
|
* DEST_FILENAME not to be there. If it happens to be
|
|
|
|
|
* there, this will fail. */
|
|
|
|
|
err = link (src_filename, dest_filename);
|
|
|
|
|
if (!err)
|
|
|
|
|
err = unlink (src_filename);
|
2007-06-15 16:46:23 +02:00
|
|
|
|
#endif /* !HAVE_W32_SYSTEM */
|
2020-03-12 10:16:56 +01:00
|
|
|
|
}
|
|
|
|
|
if (!err)
|
|
|
|
|
{
|
|
|
|
|
xfree (src_filename);
|
|
|
|
|
src_filename = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-01-29 00:58:18 +01:00
|
|
|
|
}
|
|
|
|
|
|
2008-05-20 00:46:41 +02:00
|
|
|
|
if (err || opt.dry_run)
|
2004-01-29 00:58:18 +01:00
|
|
|
|
{
|
2004-01-30 11:38:07 +01:00
|
|
|
|
int saved_errno = errno;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
|
2015-11-16 12:41:46 +01:00
|
|
|
|
/* An error occurred or a dry-run is requested. */
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (src_filename)
|
|
|
|
|
{
|
|
|
|
|
/* The change was not yet committed. */
|
|
|
|
|
unlink (src_filename);
|
|
|
|
|
if (orig_filename)
|
|
|
|
|
unlink (orig_filename);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* The changes were already committed. FIXME: This is a tad
|
|
|
|
|
dangerous, as we don't know if we don't overwrite a
|
|
|
|
|
version of the file that is even newer than the one we
|
|
|
|
|
just installed. */
|
|
|
|
|
if (orig_filename)
|
|
|
|
|
gnupg_rename_file (orig_filename, dest_filename, NULL);
|
|
|
|
|
else
|
|
|
|
|
unlink (dest_filename);
|
|
|
|
|
}
|
2008-05-20 00:46:41 +02:00
|
|
|
|
if (err)
|
|
|
|
|
gc_error (1, saved_errno, "could not commit changes");
|
|
|
|
|
|
|
|
|
|
/* Fall-through for dry run. */
|
|
|
|
|
goto leave;
|
2004-01-29 00:58:18 +01:00
|
|
|
|
}
|
2004-03-23 13:21:48 +01:00
|
|
|
|
|
|
|
|
|
/* If it all worked, notify the daemons of the changes. */
|
|
|
|
|
if (opt.runtime)
|
2020-03-12 10:16:56 +01:00
|
|
|
|
do_runtime_change (component, 0);
|
|
|
|
|
|
2004-03-23 13:21:48 +01:00
|
|
|
|
|
2004-05-21 15:46:13 +02:00
|
|
|
|
/* Move the per-process backup file into its place. */
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (orig_filename)
|
|
|
|
|
{
|
|
|
|
|
char *backup_filename;
|
2004-05-21 15:46:13 +02:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
log_assert (dest_filename);
|
2004-05-21 15:46:13 +02:00
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
backup_filename = xasprintf ("%s.%s.bak",
|
|
|
|
|
dest_filename, GPGCONF_NAME);
|
|
|
|
|
gnupg_rename_file (orig_filename, backup_filename, NULL);
|
|
|
|
|
xfree (backup_filename);
|
|
|
|
|
}
|
2004-05-21 15:46:13 +02:00
|
|
|
|
|
2008-05-20 00:46:41 +02:00
|
|
|
|
leave:
|
2017-01-23 14:26:00 +01:00
|
|
|
|
if (block)
|
|
|
|
|
gnupg_unblock_all_signals ();
|
2004-06-14 10:32:07 +02:00
|
|
|
|
xfree (line);
|
2020-03-12 10:16:56 +01:00
|
|
|
|
xfree (src_filename);
|
|
|
|
|
xfree (dest_filename);
|
|
|
|
|
xfree (orig_filename);
|
2004-01-29 00:58:18 +01:00
|
|
|
|
}
|
2007-03-06 21:44:41 +01:00
|
|
|
|
|
|
|
|
|
|
2020-04-07 16:01:40 +02:00
|
|
|
|
/* Check whether USER matches the current user or one of its group.
|
2007-03-06 21:44:41 +01:00
|
|
|
|
This function may change USER. Returns true is there is a
|
|
|
|
|
match. */
|
|
|
|
|
static int
|
|
|
|
|
key_matches_user_or_group (char *user)
|
|
|
|
|
{
|
|
|
|
|
char *group;
|
|
|
|
|
|
|
|
|
|
if (*user == '*' && user[1] == 0)
|
|
|
|
|
return 1; /* A single asterisk matches all users. */
|
|
|
|
|
|
|
|
|
|
group = strchr (user, ':');
|
|
|
|
|
if (group)
|
|
|
|
|
*group++ = 0;
|
|
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
2011-02-23 10:15:34 +01:00
|
|
|
|
/* Under Windows we don't support groups. */
|
2007-06-26 15:48:44 +02:00
|
|
|
|
if (group && *group)
|
|
|
|
|
gc_error (0, 0, _("Note that group specifications are ignored\n"));
|
2022-06-02 16:10:37 +02:00
|
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
|
if (*user)
|
|
|
|
|
{
|
|
|
|
|
static char *my_name;
|
|
|
|
|
|
|
|
|
|
if (!my_name)
|
|
|
|
|
{
|
|
|
|
|
char tmp[1];
|
|
|
|
|
DWORD size = 1;
|
|
|
|
|
|
|
|
|
|
GetUserNameA (tmp, &size);
|
|
|
|
|
my_name = xmalloc (size);
|
|
|
|
|
if (!GetUserNameA (my_name, &size))
|
|
|
|
|
gc_error (1,0, "error getting current user name: %s",
|
|
|
|
|
w32_strerror (-1));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!strcmp (user, my_name))
|
|
|
|
|
return 1; /* Found. */
|
|
|
|
|
}
|
2022-06-02 16:10:37 +02:00
|
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#else /*!HAVE_W32_SYSTEM*/
|
2022-06-02 16:10:37 +02:00
|
|
|
|
|
2007-03-06 21:44:41 +01:00
|
|
|
|
/* First check whether the user matches. */
|
|
|
|
|
if (*user)
|
|
|
|
|
{
|
|
|
|
|
static char *my_name;
|
|
|
|
|
|
|
|
|
|
if (!my_name)
|
|
|
|
|
{
|
|
|
|
|
struct passwd *pw = getpwuid ( getuid () );
|
|
|
|
|
if (!pw)
|
|
|
|
|
gc_error (1, errno, "getpwuid failed for current user");
|
|
|
|
|
my_name = xstrdup (pw->pw_name);
|
|
|
|
|
}
|
|
|
|
|
if (!strcmp (user, my_name))
|
|
|
|
|
return 1; /* Found. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* If that failed, check whether a group matches. */
|
|
|
|
|
if (group && *group)
|
|
|
|
|
{
|
|
|
|
|
static char *my_group;
|
|
|
|
|
static char **my_supgroups;
|
2007-06-26 15:48:44 +02:00
|
|
|
|
int n;
|
2007-03-06 21:44:41 +01:00
|
|
|
|
|
|
|
|
|
if (!my_group)
|
|
|
|
|
{
|
|
|
|
|
struct group *gr = getgrgid ( getgid () );
|
|
|
|
|
if (!gr)
|
|
|
|
|
gc_error (1, errno, "getgrgid failed for current user");
|
|
|
|
|
my_group = xstrdup (gr->gr_name);
|
|
|
|
|
}
|
|
|
|
|
if (!strcmp (group, my_group))
|
|
|
|
|
return 1; /* Found. */
|
|
|
|
|
|
|
|
|
|
if (!my_supgroups)
|
|
|
|
|
{
|
|
|
|
|
int ngids;
|
|
|
|
|
gid_t *gids;
|
|
|
|
|
|
|
|
|
|
ngids = getgroups (0, NULL);
|
|
|
|
|
gids = xcalloc (ngids+1, sizeof *gids);
|
|
|
|
|
ngids = getgroups (ngids, gids);
|
|
|
|
|
if (ngids < 0)
|
|
|
|
|
gc_error (1, errno, "getgroups failed for current user");
|
|
|
|
|
my_supgroups = xcalloc (ngids+1, sizeof *my_supgroups);
|
|
|
|
|
for (n=0; n < ngids; n++)
|
|
|
|
|
{
|
|
|
|
|
struct group *gr = getgrgid ( gids[n] );
|
|
|
|
|
if (!gr)
|
|
|
|
|
gc_error (1, errno, "getgrgid failed for supplementary group");
|
|
|
|
|
my_supgroups[n] = xstrdup (gr->gr_name);
|
|
|
|
|
}
|
|
|
|
|
xfree (gids);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (n=0; my_supgroups[n]; n++)
|
|
|
|
|
if (!strcmp (group, my_supgroups[n]))
|
|
|
|
|
return 1; /* Found. */
|
|
|
|
|
}
|
2022-06-02 16:10:37 +02:00
|
|
|
|
|
2007-06-26 15:48:44 +02:00
|
|
|
|
#endif /*!HAVE_W32_SYSTEM*/
|
2022-06-02 16:10:37 +02:00
|
|
|
|
|
2007-03-06 21:44:41 +01:00
|
|
|
|
return 0; /* No match. */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Read and process the global configuration file for gpgconf. This
|
|
|
|
|
optional file is used to update our internal tables at runtime and
|
|
|
|
|
may also be used to set new default values. If FNAME is NULL the
|
|
|
|
|
default name will be used. With UPDATE set to true the internal
|
|
|
|
|
tables are actually updated; if not set, only a syntax check is
|
|
|
|
|
done. If DEFAULTS is true the global options are written to the
|
2007-10-23 20:13:27 +02:00
|
|
|
|
configuration files. If LISTFP is set, no changes are done but the
|
|
|
|
|
configuration file is printed to LISTFP in a colon separated format.
|
2007-03-06 21:44:41 +01:00
|
|
|
|
|
|
|
|
|
Returns 0 on success or if the config file is not present; -1 is
|
|
|
|
|
returned on error. */
|
|
|
|
|
int
|
2007-10-23 20:13:27 +02:00
|
|
|
|
gc_process_gpgconf_conf (const char *fname_arg, int update, int defaults,
|
2010-08-18 21:25:15 +02:00
|
|
|
|
estream_t listfp)
|
2007-03-06 21:44:41 +01:00
|
|
|
|
{
|
|
|
|
|
int result = 0;
|
|
|
|
|
char *line = NULL;
|
|
|
|
|
size_t line_len = 0;
|
|
|
|
|
ssize_t length;
|
2017-01-24 15:06:43 +01:00
|
|
|
|
gpgrt_stream_t config;
|
2007-03-06 21:44:41 +01:00
|
|
|
|
int lineno = 0;
|
|
|
|
|
int in_rule = 0;
|
|
|
|
|
int got_match = 0;
|
2020-03-12 10:16:56 +01:00
|
|
|
|
int runtime[GC_COMPONENT_NR] = { 0 };
|
|
|
|
|
int component_id;
|
2007-10-23 20:13:27 +02:00
|
|
|
|
char *fname;
|
2007-03-06 21:44:41 +01:00
|
|
|
|
|
2007-10-23 20:13:27 +02:00
|
|
|
|
if (fname_arg)
|
|
|
|
|
fname = xstrdup (fname_arg);
|
|
|
|
|
else
|
2014-05-07 18:18:27 +02:00
|
|
|
|
fname = make_filename (gnupg_sysconfdir (), GPGCONF_NAME EXTSEP_S "conf",
|
|
|
|
|
NULL);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
|
2017-01-24 15:06:43 +01:00
|
|
|
|
config = gpgrt_fopen (fname, "r");
|
2007-03-06 21:44:41 +01:00
|
|
|
|
if (!config)
|
|
|
|
|
{
|
|
|
|
|
/* Do not print an error if the file is not available, except
|
2007-10-23 20:13:27 +02:00
|
|
|
|
when running in syntax check mode. */
|
2007-03-06 21:44:41 +01:00
|
|
|
|
if (errno != ENOENT || !update)
|
|
|
|
|
{
|
2020-03-03 14:17:24 +01:00
|
|
|
|
gc_error (0, errno, "can't open global config file '%s'", fname);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
result = -1;
|
|
|
|
|
}
|
2007-06-15 16:46:23 +02:00
|
|
|
|
xfree (fname);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-24 15:06:43 +01:00
|
|
|
|
while ((length = gpgrt_read_line (config, &line, &line_len, NULL)) > 0)
|
2007-03-06 21:44:41 +01:00
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
char *key, *compname, *option, *flags, *value;
|
2007-03-06 21:44:41 +01:00
|
|
|
|
char *empty;
|
|
|
|
|
gc_option_t *option_info = NULL;
|
|
|
|
|
char *p;
|
|
|
|
|
int is_continuation;
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2007-03-06 21:44:41 +01:00
|
|
|
|
lineno++;
|
|
|
|
|
key = line;
|
|
|
|
|
while (*key == ' ' || *key == '\t')
|
|
|
|
|
key++;
|
|
|
|
|
if (!*key || *key == '#' || *key == '\r' || *key == '\n')
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
is_continuation = (key != line);
|
|
|
|
|
|
|
|
|
|
/* Parse the key field. */
|
|
|
|
|
if (!is_continuation && got_match)
|
|
|
|
|
break; /* Finish after the first match. */
|
|
|
|
|
else if (!is_continuation)
|
|
|
|
|
{
|
|
|
|
|
in_rule = 0;
|
|
|
|
|
for (p=key+1; *p && !strchr (" \t\r\n", *p); p++)
|
|
|
|
|
;
|
|
|
|
|
if (!*p)
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
gc_error (0, 0, "missing rule at '%s', line %d", fname, lineno);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
result = -1;
|
2017-12-18 17:46:05 +01:00
|
|
|
|
gpgconf_write_status (STATUS_WARNING,
|
|
|
|
|
"gpgconf.conf %d file '%s' line %d "
|
|
|
|
|
"missing rule",
|
|
|
|
|
GPG_ERR_SYNTAX, fname, lineno);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
*p++ = 0;
|
2020-03-12 10:16:56 +01:00
|
|
|
|
compname = p;
|
2007-03-06 21:44:41 +01:00
|
|
|
|
}
|
|
|
|
|
else if (!in_rule)
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
gc_error (0, 0, "continuation but no rule at '%s', line %d",
|
2007-03-06 21:44:41 +01:00
|
|
|
|
fname, lineno);
|
|
|
|
|
result = -1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
compname = key;
|
2007-03-06 21:44:41 +01:00
|
|
|
|
key = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
in_rule = 1;
|
|
|
|
|
|
|
|
|
|
/* Parse the component. */
|
2020-03-12 10:16:56 +01:00
|
|
|
|
while (*compname == ' ' || *compname == '\t')
|
|
|
|
|
compname++;
|
|
|
|
|
for (p=compname; *p && !strchr (" \t\r\n", *p); p++)
|
2007-03-06 21:44:41 +01:00
|
|
|
|
;
|
2020-03-12 10:16:56 +01:00
|
|
|
|
if (p == compname)
|
2007-03-06 21:44:41 +01:00
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
gc_error (0, 0, "missing component at '%s', line %d",
|
2007-03-06 21:44:41 +01:00
|
|
|
|
fname, lineno);
|
2017-12-18 17:46:05 +01:00
|
|
|
|
gpgconf_write_status (STATUS_WARNING,
|
|
|
|
|
"gpgconf.conf %d file '%s' line %d "
|
|
|
|
|
" missing component",
|
|
|
|
|
GPG_ERR_NO_NAME, fname, lineno);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
result = -1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
empty = p;
|
|
|
|
|
*p++ = 0;
|
|
|
|
|
option = p;
|
2020-03-12 10:16:56 +01:00
|
|
|
|
component_id = gc_component_find (compname);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
if (component_id < 0)
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
gc_error (0, 0, "unknown component at '%s', line %d",
|
2007-03-06 21:44:41 +01:00
|
|
|
|
fname, lineno);
|
2017-12-18 17:46:05 +01:00
|
|
|
|
gpgconf_write_status (STATUS_WARNING,
|
|
|
|
|
"gpgconf.conf %d file '%s' line %d "
|
|
|
|
|
"unknown component",
|
|
|
|
|
GPG_ERR_UNKNOWN_NAME, fname, lineno);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
result = -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Parse the option name. */
|
|
|
|
|
while (*option == ' ' || *option == '\t')
|
|
|
|
|
option++;
|
|
|
|
|
for (p=option; *p && !strchr (" \t\r\n", *p); p++)
|
|
|
|
|
;
|
|
|
|
|
if (p == option)
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
gc_error (0, 0, "missing option at '%s', line %d",
|
2007-03-06 21:44:41 +01:00
|
|
|
|
fname, lineno);
|
2017-12-18 17:46:05 +01:00
|
|
|
|
gpgconf_write_status (STATUS_WARNING,
|
|
|
|
|
"gpgconf.conf %d file '%s' line %d "
|
|
|
|
|
"missing option",
|
|
|
|
|
GPG_ERR_INV_NAME, fname, lineno);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
result = -1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
*p++ = 0;
|
|
|
|
|
flags = p;
|
|
|
|
|
if ( component_id != -1)
|
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
/* We need to make sure that we got the option list for the
|
|
|
|
|
* component. */
|
|
|
|
|
if (!gc_component[component_id].options)
|
|
|
|
|
gc_component_retrieve_options (component_id);
|
|
|
|
|
option_info = find_option (component_id, option);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
if (!option_info)
|
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
gc_error (0, 0, "unknown option '%s' at '%s', line %d",
|
|
|
|
|
option, fname, lineno);
|
2017-12-18 17:46:05 +01:00
|
|
|
|
gpgconf_write_status (STATUS_WARNING,
|
|
|
|
|
"gpgconf.conf %d file '%s' line %d "
|
|
|
|
|
"unknown option",
|
|
|
|
|
GPG_ERR_UNKNOWN_OPTION, fname, lineno);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
result = -1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Parse the optional flags. */
|
|
|
|
|
while (*flags == ' ' || *flags == '\t')
|
|
|
|
|
flags++;
|
|
|
|
|
if (*flags == '[')
|
|
|
|
|
{
|
|
|
|
|
flags++;
|
|
|
|
|
p = strchr (flags, ']');
|
|
|
|
|
if (!p)
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
gc_error (0, 0, "syntax error in rule at '%s', line %d",
|
2007-03-06 21:44:41 +01:00
|
|
|
|
fname, lineno);
|
2017-12-18 17:46:05 +01:00
|
|
|
|
gpgconf_write_status (STATUS_WARNING,
|
|
|
|
|
"gpgconf.conf %d file '%s' line %d "
|
|
|
|
|
"syntax error in rule",
|
|
|
|
|
GPG_ERR_SYNTAX, fname, lineno);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
result = -1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
*p++ = 0;
|
|
|
|
|
value = p;
|
|
|
|
|
}
|
|
|
|
|
else /* No flags given. */
|
|
|
|
|
{
|
|
|
|
|
value = flags;
|
|
|
|
|
flags = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Parse the optional value. */
|
|
|
|
|
while (*value == ' ' || *value == '\t')
|
|
|
|
|
value++;
|
|
|
|
|
for (p=value; *p && !strchr ("\r\n", *p); p++)
|
|
|
|
|
;
|
|
|
|
|
if (p == value)
|
|
|
|
|
value = empty; /* No value given; let it point to an empty string. */
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Strip trailing white space. */
|
|
|
|
|
*p = 0;
|
|
|
|
|
for (p--; p > value && (*p == ' ' || *p == '\t'); p--)
|
|
|
|
|
*p = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Check flag combinations. */
|
|
|
|
|
if (!flags)
|
|
|
|
|
;
|
|
|
|
|
else if (!strcmp (flags, "default"))
|
|
|
|
|
{
|
|
|
|
|
if (*value)
|
|
|
|
|
{
|
|
|
|
|
gc_error (0, 0, "flag \"default\" may not be combined "
|
2012-06-05 19:29:22 +02:00
|
|
|
|
"with a value at '%s', line %d",
|
2007-03-06 21:44:41 +01:00
|
|
|
|
fname, lineno);
|
|
|
|
|
result = -1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else if (!strcmp (flags, "change"))
|
|
|
|
|
;
|
|
|
|
|
else if (!strcmp (flags, "no-change"))
|
|
|
|
|
;
|
|
|
|
|
else
|
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
gc_error (0, 0, "unknown flag at '%s', line %d",
|
2007-03-06 21:44:41 +01:00
|
|
|
|
fname, lineno);
|
|
|
|
|
result = -1;
|
|
|
|
|
}
|
2007-10-23 20:13:27 +02:00
|
|
|
|
|
|
|
|
|
/* In list mode we print out all records. */
|
|
|
|
|
if (listfp && !result)
|
|
|
|
|
{
|
|
|
|
|
/* If this is a new ruleset, print a key record. */
|
|
|
|
|
if (!is_continuation)
|
|
|
|
|
{
|
|
|
|
|
char *group = strchr (key, ':');
|
|
|
|
|
if (group)
|
|
|
|
|
{
|
|
|
|
|
*group++ = 0;
|
|
|
|
|
if ((p = strchr (group, ':')))
|
|
|
|
|
*p = 0; /* We better strip any extra stuff. */
|
2011-02-23 10:15:34 +01:00
|
|
|
|
}
|
|
|
|
|
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fprintf (listfp, "k:%s:", gc_percent_escape (key));
|
|
|
|
|
es_fprintf (listfp, "%s\n", group? gc_percent_escape (group):"");
|
2007-10-23 20:13:27 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* All other lines are rule records. */
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fprintf (listfp, "r:::%s:%s:%s:",
|
2011-02-23 10:15:34 +01:00
|
|
|
|
gc_component[component_id].name,
|
2010-08-18 21:25:15 +02:00
|
|
|
|
option_info->name? option_info->name : "",
|
|
|
|
|
flags? flags : "");
|
2007-10-23 20:13:27 +02:00
|
|
|
|
if (value != empty)
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_fprintf (listfp, "\"%s", gc_percent_escape (value));
|
2011-02-23 10:15:34 +01:00
|
|
|
|
|
2010-08-18 21:25:15 +02:00
|
|
|
|
es_putc ('\n', listfp);
|
2007-10-23 20:13:27 +02:00
|
|
|
|
}
|
|
|
|
|
|
2007-03-06 21:44:41 +01:00
|
|
|
|
/* Check whether the key matches but do this only if we are not
|
|
|
|
|
running in syntax check mode. */
|
2011-02-23 10:15:34 +01:00
|
|
|
|
if ( update
|
2007-10-23 20:13:27 +02:00
|
|
|
|
&& !result && !listfp
|
2007-03-06 21:44:41 +01:00
|
|
|
|
&& (got_match || (key && key_matches_user_or_group (key))) )
|
|
|
|
|
{
|
|
|
|
|
int newflags = 0;
|
|
|
|
|
|
|
|
|
|
got_match = 1;
|
|
|
|
|
|
|
|
|
|
/* Apply the flags from gpgconf.conf. */
|
|
|
|
|
if (!flags)
|
|
|
|
|
;
|
|
|
|
|
else if (!strcmp (flags, "default"))
|
|
|
|
|
newflags |= GC_OPT_FLAG_DEFAULT;
|
|
|
|
|
else if (!strcmp (flags, "no-change"))
|
2020-03-12 10:16:56 +01:00
|
|
|
|
option_info->no_change = 1;
|
2007-03-06 21:44:41 +01:00
|
|
|
|
else if (!strcmp (flags, "change"))
|
2020-03-12 10:16:56 +01:00
|
|
|
|
option_info->no_change = 0;
|
2007-03-06 21:44:41 +01:00
|
|
|
|
|
|
|
|
|
if (defaults)
|
|
|
|
|
{
|
More cleanup of "allow to".
* README, agent/command.c, agent/keyformat.txt, common/i18n.c,
common/iobuf.c, common/keyserver.h, dirmngr/cdblib.c,
dirmngr/ldap-wrapper.c, doc/DETAILS, doc/TRANSLATE,
doc/announce-2.1.txt, doc/gpg.texi, doc/gpgsm.texi,
doc/scdaemon.texi, doc/tools.texi, doc/whats-new-in-2.1.txt,
g10/export.c, g10/getkey.c, g10/import.c, g10/keyedit.c, m4/ksba.m4,
m4/libgcrypt.m4, m4/ntbtls.m4, po/ca.po, po/cs.po, po/da.po,
po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/fi.po,
po/fr.po, po/gl.po, po/hu.po, po/id.po, po/it.po, po/ja.po,
po/nb.po, po/pl.po, po/pt.po, po/ro.po, po/ru.po, po/sk.po,
po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po,
scd/app-p15.c, scd/ccid-driver.c, scd/command.c, sm/gpgsm.c,
sm/sign.c, tools/gpgconf-comp.c, tools/gpgtar.h: replace "Allow to"
with clearer text.
In standard English, the normal construction is "${XXX} allows ${YYY}
to" -- that is, the subject (${XXX}) of the sentence is allowing the
object (${YYY}) to do something. When the object is missing, the
phrasing sounds awkward, even if the object is implied by context.
There's almost always a better construction that isn't as awkward.
These changes should make the language a bit clearer.
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
2016-08-02 04:19:17 +02:00
|
|
|
|
/* Here we explicitly allow updating the value again. */
|
2007-03-06 21:44:41 +01:00
|
|
|
|
if (newflags)
|
|
|
|
|
{
|
|
|
|
|
option_info->new_flags = 0;
|
|
|
|
|
}
|
|
|
|
|
if (*value)
|
|
|
|
|
{
|
|
|
|
|
xfree (option_info->new_value);
|
|
|
|
|
option_info->new_value = NULL;
|
|
|
|
|
}
|
2020-03-12 10:16:56 +01:00
|
|
|
|
change_one_value (component_id, option_info,
|
|
|
|
|
runtime, newflags, value, 0);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-01-24 15:06:43 +01:00
|
|
|
|
if (length < 0 || gpgrt_ferror (config))
|
2007-03-06 21:44:41 +01:00
|
|
|
|
{
|
2012-06-05 19:29:22 +02:00
|
|
|
|
gc_error (0, errno, "error reading from '%s'", fname);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
result = -1;
|
|
|
|
|
}
|
2017-01-24 15:06:43 +01:00
|
|
|
|
if (gpgrt_fclose (config))
|
2012-06-05 19:29:22 +02:00
|
|
|
|
gc_error (0, errno, "error closing '%s'", fname);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
|
|
|
|
|
xfree (line);
|
|
|
|
|
|
|
|
|
|
/* If it all worked, process the options. */
|
2007-10-23 20:13:27 +02:00
|
|
|
|
if (!result && update && defaults && !listfp)
|
2007-03-06 21:44:41 +01:00
|
|
|
|
{
|
|
|
|
|
/* We need to switch off the runtime update, so that we can do
|
|
|
|
|
it later all at once. */
|
|
|
|
|
int save_opt_runtime = opt.runtime;
|
|
|
|
|
opt.runtime = 0;
|
|
|
|
|
|
|
|
|
|
for (component_id = 0; component_id < GC_COMPONENT_NR; component_id++)
|
|
|
|
|
{
|
2016-12-16 16:00:15 +01:00
|
|
|
|
gc_component_change_options (component_id, NULL, NULL, 0);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
}
|
|
|
|
|
opt.runtime = save_opt_runtime;
|
|
|
|
|
|
|
|
|
|
if (opt.runtime)
|
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
for (component_id = 0; component_id < GC_COMPONENT_NR; component_id++)
|
|
|
|
|
if (runtime[component_id]
|
|
|
|
|
&& gc_component[component_id].runtime_change)
|
|
|
|
|
(*gc_component[component_id].runtime_change) (0);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2007-06-15 16:46:23 +02:00
|
|
|
|
xfree (fname);
|
2007-03-06 21:44:41 +01:00
|
|
|
|
return result;
|
|
|
|
|
}
|
2016-12-16 16:00:15 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Apply the profile FNAME to all known configure files.
|
|
|
|
|
*/
|
|
|
|
|
gpg_error_t
|
|
|
|
|
gc_apply_profile (const char *fname)
|
|
|
|
|
{
|
|
|
|
|
gpg_error_t err;
|
|
|
|
|
char *fname_buffer = NULL;
|
|
|
|
|
char *line = NULL;
|
|
|
|
|
size_t line_len = 0;
|
|
|
|
|
ssize_t length;
|
|
|
|
|
estream_t fp;
|
|
|
|
|
int lineno = 0;
|
2020-03-12 10:16:56 +01:00
|
|
|
|
int runtime[GC_COMPONENT_NR] = { 0 };
|
2016-12-16 16:00:15 +01:00
|
|
|
|
int component_id = -1;
|
|
|
|
|
int skip_section = 0;
|
|
|
|
|
int error_count = 0;
|
|
|
|
|
int newflags;
|
|
|
|
|
|
|
|
|
|
if (!fname)
|
|
|
|
|
fname = "-";
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!(!strcmp (fname, "-")
|
|
|
|
|
|| strchr (fname, '/')
|
|
|
|
|
#ifdef HAVE_W32_SYSTEM
|
|
|
|
|
|| strchr (fname, '\\')
|
|
|
|
|
#endif
|
|
|
|
|
|| strchr (fname, '.')))
|
|
|
|
|
{
|
|
|
|
|
/* FNAME looks like a standard profile name. Check whether one
|
|
|
|
|
* is installed and use that instead of the given file name. */
|
|
|
|
|
fname_buffer = xstrconcat (gnupg_datadir (), DIRSEP_S,
|
|
|
|
|
fname, ".prf", NULL);
|
2020-10-20 10:43:55 +02:00
|
|
|
|
if (!gnupg_access (fname_buffer, F_OK))
|
2016-12-16 16:00:15 +01:00
|
|
|
|
fname = fname_buffer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fp = !strcmp (fname, "-")? es_stdin : es_fopen (fname, "r");
|
|
|
|
|
if (!fp)
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
log_error ("can't open '%s': %s\n", fname, gpg_strerror (err));
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (opt.verbose)
|
|
|
|
|
log_info ("applying profile '%s'\n", fname);
|
|
|
|
|
|
|
|
|
|
err = 0;
|
|
|
|
|
while ((length = es_read_line (fp, &line, &line_len, NULL)) > 0)
|
|
|
|
|
{
|
|
|
|
|
char *name, *flags, *value;
|
|
|
|
|
gc_option_t *option_info = NULL;
|
|
|
|
|
char *p;
|
|
|
|
|
|
|
|
|
|
lineno++;
|
|
|
|
|
name = line;
|
|
|
|
|
while (*name == ' ' || *name == '\t')
|
|
|
|
|
name++;
|
|
|
|
|
if (!*name || *name == '#' || *name == '\r' || *name == '\n')
|
|
|
|
|
continue;
|
|
|
|
|
trim_trailing_spaces (name);
|
|
|
|
|
|
|
|
|
|
/* Check whether this is a new section. */
|
|
|
|
|
if (*name == '[')
|
|
|
|
|
{
|
|
|
|
|
name++;
|
|
|
|
|
skip_section = 0;
|
|
|
|
|
/* New section: Get the name of the component. */
|
|
|
|
|
p = strchr (name, ']');
|
|
|
|
|
if (!p)
|
|
|
|
|
{
|
|
|
|
|
error_count++;
|
|
|
|
|
log_info ("%s:%d:%d: error: syntax error in section tag\n",
|
|
|
|
|
fname, lineno, (int)(name - line));
|
|
|
|
|
skip_section = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
*p++ = 0;
|
|
|
|
|
if (*p)
|
|
|
|
|
log_info ("%s:%d:%d: warning: garbage after section tag\n",
|
|
|
|
|
fname, lineno, (int)(p - line));
|
|
|
|
|
|
|
|
|
|
trim_spaces (name);
|
|
|
|
|
component_id = gc_component_find (name);
|
|
|
|
|
if (component_id < 0)
|
|
|
|
|
{
|
|
|
|
|
log_info ("%s:%d:%d: warning: skipping unknown section '%s'\n",
|
|
|
|
|
fname, lineno, (int)(name - line), name );
|
|
|
|
|
skip_section = 1;
|
|
|
|
|
}
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (skip_section)
|
|
|
|
|
continue;
|
|
|
|
|
if (component_id < 0)
|
|
|
|
|
{
|
|
|
|
|
error_count++;
|
|
|
|
|
log_info ("%s:%d:%d: error: not in a valid section\n",
|
|
|
|
|
fname, lineno, (int)(name - line));
|
|
|
|
|
skip_section = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Parse the option name. */
|
|
|
|
|
for (p = name; *p && !spacep (p); p++)
|
|
|
|
|
;
|
|
|
|
|
*p++ = 0;
|
|
|
|
|
value = p;
|
|
|
|
|
|
2020-03-12 10:16:56 +01:00
|
|
|
|
option_info = find_option (component_id, name);
|
2016-12-16 16:00:15 +01:00
|
|
|
|
if (!option_info)
|
|
|
|
|
{
|
|
|
|
|
error_count++;
|
|
|
|
|
log_info ("%s:%d:%d: error: unknown option '%s' in section '%s'\n",
|
|
|
|
|
fname, lineno, (int)(name - line),
|
|
|
|
|
name, gc_component[component_id].name);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Parse the optional flags. */
|
|
|
|
|
trim_spaces (value);
|
|
|
|
|
flags = value;
|
|
|
|
|
if (*flags == '[')
|
|
|
|
|
{
|
|
|
|
|
flags++;
|
|
|
|
|
p = strchr (flags, ']');
|
|
|
|
|
if (!p)
|
|
|
|
|
{
|
|
|
|
|
log_info ("%s:%d:%d: warning: invalid flag specification\n",
|
|
|
|
|
fname, lineno, (int)(p - line));
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
*p++ = 0;
|
|
|
|
|
value = p;
|
|
|
|
|
trim_spaces (value);
|
|
|
|
|
}
|
|
|
|
|
else /* No flags given. */
|
|
|
|
|
flags = NULL;
|
|
|
|
|
|
|
|
|
|
/* Set required defaults. */
|
|
|
|
|
if (gc_arg_type[option_info->arg_type].fallback == GC_ARG_TYPE_NONE
|
|
|
|
|
&& !*value)
|
|
|
|
|
value = "1";
|
|
|
|
|
|
|
|
|
|
/* Check and save this option. */
|
|
|
|
|
newflags = 0;
|
|
|
|
|
if (flags && !strcmp (flags, "default"))
|
|
|
|
|
newflags |= GC_OPT_FLAG_DEFAULT;
|
|
|
|
|
|
|
|
|
|
if (newflags)
|
|
|
|
|
option_info->new_flags = 0;
|
|
|
|
|
if (*value)
|
|
|
|
|
{
|
|
|
|
|
xfree (option_info->new_value);
|
|
|
|
|
option_info->new_value = NULL;
|
|
|
|
|
}
|
2020-03-12 10:16:56 +01:00
|
|
|
|
change_one_value (component_id, option_info, runtime, newflags, value, 1);
|
2016-12-16 16:00:15 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (length < 0 || es_ferror (fp))
|
|
|
|
|
{
|
|
|
|
|
err = gpg_error_from_syserror ();
|
|
|
|
|
error_count++;
|
|
|
|
|
log_error (_("%s:%u: read error: %s\n"),
|
|
|
|
|
fname, lineno, gpg_strerror (err));
|
|
|
|
|
}
|
|
|
|
|
if (es_fclose (fp))
|
|
|
|
|
log_error (_("error closing '%s'\n"), fname);
|
|
|
|
|
if (error_count)
|
|
|
|
|
log_error (_("error parsing '%s'\n"), fname);
|
|
|
|
|
|
|
|
|
|
xfree (line);
|
|
|
|
|
|
|
|
|
|
/* If it all worked, process the options. */
|
|
|
|
|
if (!err)
|
|
|
|
|
{
|
|
|
|
|
/* We need to switch off the runtime update, so that we can do
|
|
|
|
|
it later all at once. */
|
|
|
|
|
int save_opt_runtime = opt.runtime;
|
|
|
|
|
opt.runtime = 0;
|
|
|
|
|
|
|
|
|
|
for (component_id = 0; component_id < GC_COMPONENT_NR; component_id++)
|
|
|
|
|
{
|
|
|
|
|
gc_component_change_options (component_id, NULL, NULL, 1);
|
|
|
|
|
}
|
|
|
|
|
opt.runtime = save_opt_runtime;
|
|
|
|
|
|
|
|
|
|
if (opt.runtime)
|
|
|
|
|
{
|
2020-03-12 10:16:56 +01:00
|
|
|
|
for (component_id = 0; component_id < GC_COMPONENT_NR; component_id++)
|
|
|
|
|
if (runtime[component_id]
|
|
|
|
|
&& gc_component[component_id].runtime_change)
|
|
|
|
|
(*gc_component[component_id].runtime_change) (0);
|
2016-12-16 16:00:15 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
xfree (fname_buffer);
|
|
|
|
|
return err;
|
|
|
|
|
}
|