diff options
| author | Marcus Brinkmann <[email protected]> | 2012-01-03 17:13:19 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2012-01-03 17:13:19 +0000 |
| commit | 0868997e186cd847663668f9d7a29806a12da2d2 (patch) | |
| tree | 73645f778a2d16213723121a76d2b38ca90edfcc /dirmngr | |
| parent | Add lost ChangeLog entry. (diff) | |
| parent | Silence gcc warning. (diff) | |
| download | gnupg-npth.tar.gz gnupg-npth.zip | |
Merge branch 'master' into npthnpth
Conflicts:
ChangeLog-2011
Makefile.am
agent/ChangeLog-2011
agent/gpg-agent.c
dirmngr/ChangeLog-2011
dirmngr/dirmngr.c
doc/HACKING
g13/g13.c
po/de.po
scd/ChangeLog-2011
scd/apdu.c
scd/command.c
scd/scdaemon.c
scripts/gitlog-to-changelog
tools/ChangeLog-2011
Diffstat (limited to 'dirmngr')
| -rw-r--r-- | dirmngr/ChangeLog-2011 | 15 | ||||
| -rw-r--r-- | dirmngr/dirmngr.c | 2 |
2 files changed, 1 insertions, 16 deletions
diff --git a/dirmngr/ChangeLog-2011 b/dirmngr/ChangeLog-2011 index b35bec313..84cf55288 100644 --- a/dirmngr/ChangeLog-2011 +++ b/dirmngr/ChangeLog-2011 @@ -15,21 +15,6 @@ * certcache.c (classify_pattern): Remove unused variable and make explicit substring search work. -2011-11-24 Werner Koch <[email protected]> - - * ks-engine-http.c (ks_http_help): Do not print help for hkp. - * ks-engine-hkp.c (ks_hkp_help): Print help only for hkp. - (send_request): Remove test code. - (map_host): Use xtrymalloc. - - * certcache.c (classify_pattern): Remove unused variable and make - explicit substring search work. - -2011-10-13 Marcus Brinkmann <[email protected]> - - * Makefile.am, certcache.c, crlfetch.c, dirmngr.c, ldap-wrapper.c: - Port to NPth. - 2011-06-01 Marcus Brinkmann <[email protected]> * Makefile.am (dirmngr_ldap_CFLAGS): Add $(LIBGCRYPT_CFLAGS), diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 333ab9e73..51cefd590 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -1038,7 +1038,7 @@ main (int argc, char **argv) if (csh_style) { *strchr (infostr, '=') = ' '; - es_printf ( "setenv %s\n", infostr); + es_printf ( "setenv %s;\n", infostr); } else { |