mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01:00
dirmngr: New dummy option --compatibility-flags.
* dirmngr/dirmngr.c (oCompatibilityFlags): New. (opts): Add option --compatibility-flags. (compatibility_flags): New. (parse_rereadable_options): Parse them.
This commit is contained in:
parent
47cce2020d
commit
ff81ded48d
@ -157,6 +157,7 @@ enum cmd_and_opt_values {
|
|||||||
oConnectTimeout,
|
oConnectTimeout,
|
||||||
oConnectQuickTimeout,
|
oConnectQuickTimeout,
|
||||||
oListenBacklog,
|
oListenBacklog,
|
||||||
|
oCompatibilityFlags,
|
||||||
aTest
|
aTest
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -297,6 +298,7 @@ static ARGPARSE_OPTS opts[] = {
|
|||||||
|
|
||||||
ARGPARSE_s_s (oSocketName, "socket-name", "@"), /* Only for debugging. */
|
ARGPARSE_s_s (oSocketName, "socket-name", "@"), /* Only for debugging. */
|
||||||
ARGPARSE_s_n (oDebugCacheExpiredCerts, "debug-cache-expired-certs", "@"),
|
ARGPARSE_s_n (oDebugCacheExpiredCerts, "debug-cache-expired-certs", "@"),
|
||||||
|
ARGPARSE_s_s (oCompatibilityFlags, "compatibility-flags", "@"),
|
||||||
|
|
||||||
ARGPARSE_header (NULL, ""), /* Stop the header group. */
|
ARGPARSE_header (NULL, ""), /* Stop the header group. */
|
||||||
|
|
||||||
@ -328,6 +330,13 @@ static struct debug_flags_s debug_flags [] =
|
|||||||
{ 77, NULL } /* 77 := Do not exit on "help" or "?". */
|
{ 77, NULL } /* 77 := Do not exit on "help" or "?". */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* The list of compatibility flags. */
|
||||||
|
static struct compatibility_flags_s compatibility_flags [] =
|
||||||
|
{
|
||||||
|
{ 0, NULL }
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
#define DEFAULT_MAX_REPLIES 10
|
#define DEFAULT_MAX_REPLIES 10
|
||||||
#define DEFAULT_LDAP_TIMEOUT 15 /* seconds */
|
#define DEFAULT_LDAP_TIMEOUT 15 /* seconds */
|
||||||
|
|
||||||
@ -709,6 +718,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
|
|||||||
opt.ldaptimeout = DEFAULT_LDAP_TIMEOUT;
|
opt.ldaptimeout = DEFAULT_LDAP_TIMEOUT;
|
||||||
ldapserver_list_needs_reset = 1;
|
ldapserver_list_needs_reset = 1;
|
||||||
opt.debug_cache_expired_certs = 0;
|
opt.debug_cache_expired_certs = 0;
|
||||||
|
opt.compat_flags = 0;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -871,6 +881,15 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
|
|||||||
opt.debug_cache_expired_certs = 0;
|
opt.debug_cache_expired_certs = 0;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case oCompatibilityFlags:
|
||||||
|
if (parse_compatibility_flags (pargs->r.ret_str, &opt.compat_flags,
|
||||||
|
compatibility_flags))
|
||||||
|
{
|
||||||
|
pargs->r_opt = ARGPARSE_INVALID_ARG;
|
||||||
|
pargs->err = ARGPARSE_PRINT_WARNING;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return 0; /* Not handled. */
|
return 0; /* Not handled. */
|
||||||
}
|
}
|
||||||
|
@ -153,6 +153,9 @@ struct
|
|||||||
current after nextUpdate. */
|
current after nextUpdate. */
|
||||||
|
|
||||||
strlist_t keyserver; /* List of default keyservers. */
|
strlist_t keyserver; /* List of default keyservers. */
|
||||||
|
|
||||||
|
/* Compatibility flags (COMPAT_FLAG_xxxx). */
|
||||||
|
unsigned int compat_flags;
|
||||||
} opt;
|
} opt;
|
||||||
|
|
||||||
|
|
||||||
@ -179,6 +182,10 @@ struct
|
|||||||
#define DBG_LOOKUP (opt.debug & DBG_LOOKUP_VALUE)
|
#define DBG_LOOKUP (opt.debug & DBG_LOOKUP_VALUE)
|
||||||
#define DBG_EXTPROG (opt.debug & DBG_EXTPROG_VALUE)
|
#define DBG_EXTPROG (opt.debug & DBG_EXTPROG_VALUE)
|
||||||
|
|
||||||
|
/* Compatibility flags */
|
||||||
|
/* None so far. */
|
||||||
|
|
||||||
|
|
||||||
/* A simple list of certificate references. FIXME: Better use
|
/* A simple list of certificate references. FIXME: Better use
|
||||||
certlist_t also for references (Store NULL at .cert) */
|
certlist_t also for references (Store NULL at .cert) */
|
||||||
struct cert_ref_s
|
struct cert_ref_s
|
||||||
|
@ -168,6 +168,14 @@ Append all logging output to @var{file}. This is very helpful in
|
|||||||
seeing what the agent actually does. Use @file{socket://} to log to
|
seeing what the agent actually does. Use @file{socket://} to log to
|
||||||
socket.
|
socket.
|
||||||
|
|
||||||
|
@item --compatibility-flags @var{flags}
|
||||||
|
@opindex compatibility-flags
|
||||||
|
Set compatibility flags to work around certain problems or to emulate
|
||||||
|
bugs. The @var{flags} are given as a comma separated list of flag
|
||||||
|
names and are OR-ed together. The special flag "none" clears the list
|
||||||
|
and allows to start over with an empty list. To get a list of
|
||||||
|
available flags the sole word "help" can be used.
|
||||||
|
|
||||||
@item --debug-level @var{level}
|
@item --debug-level @var{level}
|
||||||
@opindex debug-level
|
@opindex debug-level
|
||||||
Select the debug level for investigating problems. @var{level} may be a
|
Select the debug level for investigating problems. @var{level} may be a
|
||||||
|
Loading…
x
Reference in New Issue
Block a user