aboutsummaryrefslogtreecommitdiffstats
path: root/dirmngr
diff options
context:
space:
mode:
Diffstat (limited to 'dirmngr')
-rw-r--r--dirmngr/dirmngr.c4
-rw-r--r--dirmngr/dns.c4
-rw-r--r--dirmngr/http.c2
-rw-r--r--dirmngr/ldap-wrapper.c4
-rw-r--r--dirmngr/ocsp.c2
-rw-r--r--dirmngr/workqueue.c4
6 files changed, 10 insertions, 10 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 88f0aa430..9b80a20ba 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -1614,7 +1614,7 @@ dirmngr_deinit_default_ctrl (ctrl_t ctrl)
/* Create a list of LDAP servers from the file FILENAME. Returns the
list or NULL in case of errors.
- The format fo such a file is line oriented where empty lines and
+ The format of such a file is line oriented where empty lines and
lines starting with a hash mark are ignored. All other lines are
assumed to be colon seprated with these fields:
@@ -1821,7 +1821,7 @@ parse_ocsp_signer (const char *string)
Fixme: Due to the way the argument parsing works, we create a
memory leak here for all string type arguments. There is currently
no clean way to tell whether the memory for the argument has been
- allocated or points into the process' original arguments. Unless
+ allocated or points into the process's original arguments. Unless
we have a mechanism to tell this, we need to live on with this. */
static void
reread_configuration (void)
diff --git a/dirmngr/dns.c b/dirmngr/dns.c
index 2cc1c7049..9d5570821 100644
--- a/dirmngr/dns.c
+++ b/dirmngr/dns.c
@@ -7646,7 +7646,7 @@ retry:
goto udp_connect_retry;
} else if (error == ECONNREFUSED)
/* Error for previous socket operation may
- be reserverd(?) asynchronously. */
+ be reserved(?) asynchronously. */
goto udp_connect_retry;
if (error)
@@ -8244,7 +8244,7 @@ struct dns_resolver *dns_res_open(struct dns_resolv_conf *resconf, struct dns_ho
/*
* Don't try to load it ourselves because a NULL object might be an
* error from, say, dns_resconf_root(), and loading
- * dns_resconf_local() by default would create undesirable surpises.
+ * dns_resconf_local() by default would create undesirable surprises.
*/
if (!resconf || !hosts || !hints) {
if (!*_error)
diff --git a/dirmngr/http.c b/dirmngr/http.c
index de62edc08..f26675f9b 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -39,7 +39,7 @@
- stpcpy is required
- fixme: list other requirements.
- - Either HTTP_USE_NTBTLS or HTTP_USE_GNUTLS must be defind to select
+ - Either HTTP_USE_NTBTLS or HTTP_USE_GNUTLS must be defined to select
which TLS library to use.
- With HTTP_NO_WSASTARTUP the socket initialization is not done
diff --git a/dirmngr/ldap-wrapper.c b/dirmngr/ldap-wrapper.c
index d1e7dc0c4..31de6e030 100644
--- a/dirmngr/ldap-wrapper.c
+++ b/dirmngr/ldap-wrapper.c
@@ -22,9 +22,9 @@
* We can't use LDAP directly for these reasons:
*
* 1. The LDAP library is linked to separate crypto library like
- * OpenSSL and even if it is linked to the libary we use in dirmngr
+ * OpenSSL and even if it is linked to the library we use in dirmngr
* (ntbtls or gnutls) it is sometimes a different version of that
- * libary with all the surprising failures you may get due to this.
+ * library with all the surprising failures you may get due to this.
*
* 2. It is huge library in particular if TLS comes into play. So
* problems with unfreed memory might turn up and we don't want
diff --git a/dirmngr/ocsp.c b/dirmngr/ocsp.c
index e19779c59..0b846651c 100644
--- a/dirmngr/ocsp.c
+++ b/dirmngr/ocsp.c
@@ -305,7 +305,7 @@ do_ocsp_request (ctrl_t ctrl, ksba_ocsp_t ocsp,
if (opt.verbose)
log_info (_("OCSP responder at '%s' status: %s\n"), url, t);
- /* Get the signature value now because we can all this fucntion
+ /* Get the signature value now because we can all this function
* only once. */
*r_sigval = ksba_ocsp_get_sig_val (ocsp, r_produced_at);
diff --git a/dirmngr/workqueue.c b/dirmngr/workqueue.c
index a47cdebc8..2974f5d08 100644
--- a/dirmngr/workqueue.c
+++ b/dirmngr/workqueue.c
@@ -38,7 +38,7 @@ struct wqitem_s
* task is not associated with a specific session. */
unsigned int session_id;
- /* The function to perform the backgrount task. */
+ /* The function to perform the background task. */
wqtask_t func;
/* A string with the string argument for that task. */
@@ -59,7 +59,7 @@ workqueue_dump_queue (ctrl_t ctrl)
wqitem_t item;
unsigned int count;
- /* Temporay detach the entiere workqueue so that other threads don't
+ /* Temporarily detach the entiere workqueue so that other threads don't
* get into our way. */
saved_workqueue = workqueue;
workqueue = NULL;