From 90be4c67f55e3ca89cdf337ed16015465d46d63a Mon Sep 17 00:00:00 2001
From: Richard Russon <rich@flatcap.org>
Date: Sat, 23 Jun 2018 01:43:55 +0100
Subject: [PATCH] mutt_fqdn

---
 alias.c              | 6 +++---
 ncrypt/crypt.c       | 2 +-
 ncrypt/crypt_gpgme.c | 2 +-
 ncrypt/pgp.c         | 2 +-
 protos.h             | 2 +-
 remailer.c           | 2 +-
 send.c               | 2 +-
 sendlib.c            | 6 +++---
 smtp.c               | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/alias.c b/alias.c
index d93d7e9ae..e8814feb8 100644
--- a/alias.c
+++ b/alias.c
@@ -115,7 +115,7 @@ static struct Address *expand_aliases_r(struct Address *a, struct ListHead *expn
     last->next = NULL;
   }
 
-  if (UseDomain && (fqdn = mutt_fqdn(1)))
+  if (UseDomain && (fqdn = mutt_fqdn(true)))
   {
     /* now qualify all local addresses */
     mutt_addr_qualify(head, fqdn);
@@ -682,13 +682,13 @@ bool mutt_addr_is_user(struct Address *addr)
     mutt_debug(5, "#2 yes, %s = %s @ %s\n", addr->mailbox, Username, ShortHostname);
     return true;
   }
-  fqdn = mutt_fqdn(0);
+  fqdn = mutt_fqdn(false);
   if (string_is_address(addr->mailbox, Username, fqdn))
   {
     mutt_debug(5, "#3 yes, %s = %s @ %s\n", addr->mailbox, Username, NONULL(fqdn));
     return true;
   }
-  fqdn = mutt_fqdn(1);
+  fqdn = mutt_fqdn(true);
   if (string_is_address(addr->mailbox, Username, fqdn))
   {
     mutt_debug(5, "#4 yes, %s = %s @ %s\n", addr->mailbox, Username, NONULL(fqdn));
diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c
index ab6d8fa66..a70cf0ee1 100644
--- a/ncrypt/crypt.c
+++ b/ncrypt/crypt.c
@@ -861,7 +861,7 @@ void crypt_extract_keys_from_messages(struct Header *h)
 int crypt_get_keys(struct Header *msg, char **keylist, bool oppenc_mode)
 {
   struct Address *addrlist = NULL, *last = NULL;
-  const char *fqdn = mutt_fqdn(1);
+  const char *fqdn = mutt_fqdn(true);
   char *self_encrypt = NULL;
 
   /* Do a quick check to make sure that we can find all of the encryption
diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 1435f18cb..83d9caa57 100644
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -4595,7 +4595,7 @@ static char *find_keys(struct Address *addrlist, unsigned int app, bool oppenc_m
   struct Address *addr = NULL;
   struct Address *p = NULL, *q = NULL;
   struct CryptKeyInfo *k_info = NULL;
-  const char *fqdn = mutt_fqdn(1);
+  const char *fqdn = mutt_fqdn(true);
   char buf[LONG_STRING];
   int forced_valid;
   int r;
diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index 487818f13..77c916cde 100644
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -1325,7 +1325,7 @@ char *pgp_class_find_keys(struct Address *addrlist, bool oppenc_mode)
   int r;
   bool key_selected;
 
-  const char *fqdn = mutt_fqdn(1);
+  const char *fqdn = mutt_fqdn(true);
 
   for (p = addrlist; p; p = p->next)
   {
diff --git a/protos.h b/protos.h
index b75bdf369..afeb15776 100644
--- a/protos.h
+++ b/protos.h
@@ -137,7 +137,7 @@ int mutt_set_xdg_path(enum XdgType type, char *buf, size_t bufsize);
 
 const char *mutt_make_version(void);
 
-const char *mutt_fqdn(short may_hide_host);
+const char *mutt_fqdn(bool may_hide_host);
 
 void mutt_account_hook(const char *url);
 void mutt_add_to_reference_headers(struct Envelope *env, struct Envelope *curenv);
diff --git a/remailer.c b/remailer.c
index 29a56c1eb..0ec1f4340 100644
--- a/remailer.c
+++ b/remailer.c
@@ -726,7 +726,7 @@ int mix_check_message(struct Header *msg)
 
   if (need_hostname)
   {
-    fqdn = mutt_fqdn(1);
+    fqdn = mutt_fqdn(true);
     if (!fqdn)
     {
       mutt_error(_("Please set the hostname variable to a proper value when "
diff --git a/send.c b/send.c
index 45cc8cdd7..4996dac5c 100644
--- a/send.c
+++ b/send.c
@@ -1069,7 +1069,7 @@ static struct Address *set_reverse_name(struct Envelope *env)
 struct Address *mutt_default_from(void)
 {
   struct Address *addr = NULL;
-  const char *fqdn = mutt_fqdn(1);
+  const char *fqdn = mutt_fqdn(true);
 
   /* Note: We let $from override $realname here.
    *       Is this the right thing to do?
diff --git a/sendlib.c b/sendlib.c
index 16d17001d..d97504ed4 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -2316,7 +2316,7 @@ static void encode_headers(struct ListHead *h)
  *
  * @warning Do not free the returned pointer
  */
-const char *mutt_fqdn(short may_hide_host)
+const char *mutt_fqdn(bool may_hide_host)
 {
   if (!Hostname || (Hostname[0] == '@'))
     return NULL;
@@ -2356,7 +2356,7 @@ static char *gen_msgid(void)
   rndid[MUTT_RANDTAG_LEN] = 0;
   now = time(NULL);
   struct tm *tm = gmtime(&now);
-  const char *fqdn = mutt_fqdn(0);
+  const char *fqdn = mutt_fqdn(false);
   if (!fqdn)
     fqdn = NONULL(ShortHostname);
 
@@ -2914,7 +2914,7 @@ static int bounce_message(FILE *fp, struct Header *h, struct Address *to,
 
 int mutt_bounce_message(FILE *fp, struct Header *h, struct Address *to)
 {
-  const char *fqdn = mutt_fqdn(1);
+  const char *fqdn = mutt_fqdn(true);
   char resent_from[STRING];
   char *err = NULL;
 
diff --git a/smtp.c b/smtp.c
index 5fec33c86..03566ad5d 100644
--- a/smtp.c
+++ b/smtp.c
@@ -340,7 +340,7 @@ static int smtp_helo(struct Connection *conn)
 #endif
   }
 
-  fqdn = mutt_fqdn(0);
+  fqdn = mutt_fqdn(false);
   if (!fqdn)
     fqdn = NONULL(ShortHostname);
 
-- 
2.40.0