diff options
| author | Werner Koch <wk@gnupg.org> | 2011-01-20 14:21:46 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2011-01-20 14:21:46 +0100 |
| commit | 49d25d3185636237b356781cdde7960f234f2d11 (patch) | |
| tree | 3558e3a7ba9aec79e9ace48348f775a23635d208 /common | |
| parent | All standard keyserver commands are now using dirmngr. (diff) | |
| parent | Fixed a CR/LF problem on Windows (diff) | |
| download | gnupg2-49d25d3185636237b356781cdde7960f234f2d11.tar.xz gnupg2-49d25d3185636237b356781cdde7960f234f2d11.zip | |
Merge branch 'master' into keyserver-via-dirmngr
Diffstat (limited to 'common')
| -rw-r--r-- | common/ChangeLog | 9 | ||||
| -rw-r--r-- | common/homedir.c | 2 | ||||
| -rw-r--r-- | common/session-env.c | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/common/ChangeLog b/common/ChangeLog index 3b7506492..88e91f967 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -9,14 +9,17 @@ (insert_escapes): Implement using escape_data. (http_escape_data): New. +2011-01-19 Werner Koch <wk@g10code.com> + + * homedir.c (gnupg_module_name): Use NAME_OF_INSTALLED_GPG instead + of "gpg2". + 2011-01-18 Werner Koch <wk@g10code.com> * iobuf.c (file_es_filter_ctx_t): New. (file_es_filter): New. (iobuf_esopen): New. - * estream.c (es_func_mem_write): Fix computation of NEWSIZE. - * membuf.c (clear_membuf, peek_membuf): New. * util.h (GPG_ERR_NO_KEYSERVER): New. @@ -29,6 +32,8 @@ * http.h (parsed_uri_s): Add field IS_HTTP. (http_parse_uri): Support NO_SCHEME_CHECK arg. + * estream.c (es_func_mem_write): Fix computation of NEWSIZE. + 2011-01-10 Werner Koch <wk@g10code.com> * session-env.c (update_var): Fix same value detection. Fixes diff --git a/common/homedir.c b/common/homedir.c index a6364f8b5..3d31bd376 100644 --- a/common/homedir.c +++ b/common/homedir.c @@ -528,7 +528,7 @@ gnupg_module_name (int which) X(bindir, "gpgsm"); case GNUPG_MODULE_NAME_GPG: - X(bindir, "gpg2"); + X(bindir, NAME_OF_INSTALLED_GPG); case GNUPG_MODULE_NAME_CONNECT_AGENT: X(bindir, "gpg-connect-agent"); diff --git a/common/session-env.c b/common/session-env.c index 2dcf425b6..d719a7b87 100644 --- a/common/session-env.c +++ b/common/session-env.c @@ -183,10 +183,11 @@ update_var (session_env_t se, const char *string, size_t namelen, else if (!strncmp (se->array[idx]->name, string, namelen) && strlen (se->array[idx]->name) == namelen) { - /* Check if the value is the same; no need to update it, - except for updating the default flag. */ if (strlen (se->array[idx]->value) == valuelen) { + /* The new value has the same length. We can update it + in-place. */ + memcpy (se->array[idx]->value, value, valuelen); se->array[idx]->is_default = !!set_default; return 0; } |