projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Deal with $hostname and $shorthost
[apps/madmutt.git]
/
sendlib.c
diff --git
a/sendlib.c
b/sendlib.c
index
669140d
..
1802e1d
100644
(file)
--- a/
sendlib.c
+++ b/
sendlib.c
@@
-1539,22
+1539,22
@@
static void encode_headers (string_list_t * h)
}
}
}
}
-const char *mutt_fqdn
(short may_hide_host)
+const char *mutt_fqdn(short may_hide_host)
{
char *p = NULL, *q;
{
char *p = NULL, *q;
- if (
Fqdn && Fqdn
[0] != '@') {
- p =
Fqdn
;
+ if (
MCore.hostname && MCore.hostname
[0] != '@') {
+ p =
MCore.hostname
;
if (may_hide_host && option (OPTHIDDENHOST)) {
if (may_hide_host && option (OPTHIDDENHOST)) {
- if ((p = strchr
(Fqdn
, '.')))
+ if ((p = strchr
(MCore.hostname
, '.')))
p++;
/* sanity check: don't hide the host if
the fqdn is something like detebe.org. */
p++;
/* sanity check: don't hide the host if
the fqdn is something like detebe.org. */
- if (!p || !(q = strchr
(p, '.')))
- p =
Fqdn
;
+ if (!p || !(q = strchr(p, '.')))
+ p =
MCore.hostname
;
}
}
}
}
@@
-1657,7
+1657,7
@@
static char *mutt_gen_msgid (void)
const char *fqdn;
if (!(fqdn = mutt_fqdn(0)))
const char *fqdn;
if (!(fqdn = mutt_fqdn(0)))
- fqdn = NONULL(
Hostname
);
+ fqdn = NONULL(
MCore.shorthost
);
mutt_gen_localpart(localpart, sizeof(localpart), MsgIdFormat);
snprintf(buf, sizeof(buf), "<%s@%s>", localpart, fqdn);
mutt_gen_localpart(localpart, sizeof(localpart), MsgIdFormat);
snprintf(buf, sizeof(buf), "<%s@%s>", localpart, fqdn);