security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

2004-03-23 Marcus Brinkmann <marcus@g10code.de> 

* gpgconf-comp.c (gc_options_dirmngr): Set GC_OPT_FLAG_ARG_OPT for
	"LDAP Server".
	(change_options_file): Remove assertion that tests that this flag
	is not present.  Handle an empty string in OPTION->new_value.
This commit is contained in:
Marcus Brinkmann 2004-03-23 18:27:37 +00:00
parent fae48e4f76
commit 3b7262e41e
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/ChangeLog
View File

@ -1,5 +1,10 @@
2004-03-23 Marcus Brinkmann <marcus@g10code.de>
* gpgconf-comp.c (gc_options_dirmngr): Set GC_OPT_FLAG_ARG_OPT for
"LDAP Server".
(change_options_file): Remove assertion that tests that this flag
is not present. Handle an empty string in OPTION->new_value.
* gpgconf.c (main): Remove obsolete warning.
2004-03-23 Werner Koch <wk@gnupg.org>

7
tools/gpgconf-comp.c
View File

@ -743,7 +743,7 @@ static gc_option_t gc_options_dirmngr[] =
/* This entry must come after at least one entry for
GC_BACKEND_DIRMNGR in this component, so that the entry for
"ldapserverlist-file will be initialized before this one. */
{ "LDAP Server", GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
{ "LDAP Server", GC_OPT_FLAG_ARG_OPT|GC_OPT_FLAG_LIST, GC_LEVEL_BASIC,
NULL, "LDAP server list",
GC_ARG_TYPE_LDAP_SERVER, GC_BACKEND_DIRMNGR_LDAP_SERVER_LIST },
@ -1648,7 +1648,6 @@ change_options_file (gc_component_t component, gc_backend_t backend,
assert (option);
assert (option->active);
assert (gc_arg_type[option->arg_type].fallback != GC_ARG_TYPE_NONE);
assert (!(option->flags & GC_OPT_FLAG_ARG_OPT));
/* FIXME. Throughout the function, do better error reporting. */
/* Note that get_config_pathname() calls percent_deescape(), so we
@ -1658,7 +1657,9 @@ change_options_file (gc_component_t component, gc_backend_t backend,
orig_filename = xasprintf ("%s.gpgconf.%i.bak", dest_filename, getpid ());
arg = option->new_value;
if (arg)
if (arg && arg[0] == '\0')
arg = NULL;
else if (arg)
{
char *end;