From 54eb375ff14e2a93cea70eab35719be4d25f51ca Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Wed, 24 Oct 2018 15:56:18 -0400 Subject: all: fix spelling and typos Signed-off-by: Daniel Kahn Gillmor --- dirmngr/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dirmngr/misc.c') diff --git a/dirmngr/misc.c b/dirmngr/misc.c index 1270b834d..9ad60d59f 100644 --- a/dirmngr/misc.c +++ b/dirmngr/misc.c @@ -637,7 +637,7 @@ armor_data (char **r_string, const void *data, size_t datalen) } -/* Copy all data from IN to OUT. OUT may be NULL to use this fucntion +/* Copy all data from IN to OUT. OUT may be NULL to use this function * as a dummy reader. */ gpg_error_t copy_stream (estream_t in, estream_t out) -- cgit From a3a5a2451924640588e5ecc03a1d4ba6a6ba94a5 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 5 Nov 2018 08:59:13 +0100 Subject: dirmngr: Fix LDAP port parsing. * dirmngr/misc.c (host_and_port_from_url): Fix bad port parsing and a segv for a missing slash after the host name. -- Reportted-by: Tomas Mraz GnuPG-bug-id: 4230 Signed-off-by: Werner Koch --- dirmngr/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dirmngr/misc.c') diff --git a/dirmngr/misc.c b/dirmngr/misc.c index 9ad60d59f..9cedf911c 100644 --- a/dirmngr/misc.c +++ b/dirmngr/misc.c @@ -515,7 +515,7 @@ host_and_port_from_url (const char *url, int *port) if ((p = strchr (buf, '/'))) *p++ = 0; strlwr (buf); - if ((p = strchr (p, ':'))) + if ((p = strchr (buf, ':'))) { *p++ = 0; *port = atoi (p); -- cgit