diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/comopt.c | 8 | ||||
| -rw-r--r-- | common/comopt.h | 1 | ||||
| -rw-r--r-- | common/homedir.c | 3 | ||||
| -rw-r--r-- | common/util.h | 1 |
4 files changed, 12 insertions, 1 deletions
diff --git a/common/comopt.c b/common/comopt.c index 764df57c6..470cdac61 100644 --- a/common/comopt.c +++ b/common/comopt.c @@ -45,6 +45,7 @@ enum opt_values oLogFile = 500, oUseKeyboxd, oKeyboxdProgram, + oNoAutostart, oNoop }; @@ -52,6 +53,7 @@ enum opt_values static gpgrt_opt_t opts[] = { ARGPARSE_s_s (oLogFile, "log-file", "@"), ARGPARSE_s_n (oUseKeyboxd, "use-keyboxd", "@"), + ARGPARSE_s_n (oNoAutostart, "no-autostart", "@"), ARGPARSE_s_s (oKeyboxdProgram, "keyboxd-program", "@"), ARGPARSE_end () @@ -60,7 +62,7 @@ static gpgrt_opt_t opts[] = { /* Parse the common options in the homedir and etc. This needs to be - * called after the gpgrt config directories are. MODULE_ID is one of + * called after the gpgrt config directories are set. MODULE_ID is one of * the GNUPG_MODULE_NAME_ constants. If verbose is true info about * the parsing is printed. Note that this function is not * thread-safe. */ @@ -102,6 +104,10 @@ parse_comopt (int module_id, int verbose) comopt.use_keyboxd = 1; break; + case oNoAutostart: + comopt.no_autostart = 1; + break; + case oKeyboxdProgram: comopt.keyboxd_program = pargs.r.ret_str; break; diff --git a/common/comopt.h b/common/comopt.h index 1cdf25fe7..7947f35b3 100644 --- a/common/comopt.h +++ b/common/comopt.h @@ -40,6 +40,7 @@ struct { char *logfile; /* Socket used by daemons for logging. */ int use_keyboxd; /* Use the keyboxd as storage backend. */ + int no_autostart; /* Do not start gpg-agent. */ char *keyboxd_program; /* Use this as keyboxd program. */ } comopt; diff --git a/common/homedir.c b/common/homedir.c index 260aeb2fa..dd4963c32 100644 --- a/common/homedir.c +++ b/common/homedir.c @@ -1592,6 +1592,9 @@ gnupg_module_name (int which) case GNUPG_MODULE_NAME_GPGCONF: X(bindir, "tools", "gpgconf"); + case GNUPG_MODULE_NAME_CARD: + X(bindir, "tools", "gpg-card"); + default: BUG (); } diff --git a/common/util.h b/common/util.h index 62e5af51d..6978ab896 100644 --- a/common/util.h +++ b/common/util.h @@ -297,6 +297,7 @@ char *_gnupg_socketdir_internal (int skip_checks, unsigned *r_info); #define GNUPG_MODULE_NAME_GPGV 12 #define GNUPG_MODULE_NAME_KEYBOXD 13 #define GNUPG_MODULE_NAME_TPM2DAEMON 14 +#define GNUPG_MODULE_NAME_CARD 15 const char *gnupg_module_name (int which); void gnupg_module_name_flush_some (void); void gnupg_set_builddir (const char *newdir); |