debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: use 'localhost' rather than fqdn for default mail address.

Browse source 
As discussed in the thread starting at [1], the fully qualified domain
name is a bit tricky to get reproducibly, might reveal information
people prefer to keep private, and somewhat unlikely to provide
reliable mail routing.

The new approach of $current_username@localhost is better for the
first two considerations, and probably at least as good as a test mail
address.

[1]: id:87sfyibqhj.fsf@tethera.net
This commit is contained in:
David Bremner 2021-09-09 09:51:03 -03:00
parent 63b7837e0d
commit 060ff57642
2 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/config.cc
View file

@ -543,25 +543,11 @@ _get_username_from_passwd_file (void *ctx)
static const char *
_get_email_from_passwd_file (void *ctx)
{
char hostname[256];
struct hostent *hostent;
const char *domainname;
char *email;
char *username = _get_username_from_passwd_file (ctx);
gethostname (hostname, 256);
hostname[255] = '\0';
hostent = gethostbyname (hostname);
if (hostent && (domainname = strchr (hostent->h_name, '.')))
domainname += 1;
else
domainname = "(none)";
email = talloc_asprintf (ctx, "%s@%s.%s",
username, hostname, domainname);
email = talloc_asprintf (ctx, "%s@localhost", username);
talloc_free (username);
return email;

10
test/T590-libconfig.sh
View file

@ -12,12 +12,10 @@ import os, sys, pwd, socket
pw = pwd.getpwuid(os.getuid())
user = pw.pw_name
name = pw.pw_gecos.partition(",")[0]
fqdn = socket.getaddrinfo(socket.gethostname(), 0, 0,
socket.SOCK_STREAM, 0, socket.AI_CANONNAME)[0][3]
for l in sys.stdin:
if l[:4] == "08: ":
l = l.replace(user, "USERNAME", 1).replace("@" + fqdn, "@FQDN", 1)
l = l.replace(".(none)", "", 1).replace(".localdomain", "", 1)
l = l.replace(user, "USERNAME", 1)
elif l[:4] == "10: ":
l = l.replace("'" + name, "'USER_FULL_NAME", 1)
sys.stdout.write(l)
@ -416,7 +414,7 @@ cat <<'EOF' >EXPECTED
05: 'unread;inbox'
06: ''
07: 'true'
08: 'USERNAME@FQDN'
08: 'USERNAME@localhost'
09: 'NULL'
10: 'USER_FULL_NAME'
11: '8000'
@ -761,7 +759,7 @@ cat <<'EOF' >EXPECTED
05: 'unread;inbox'
06: ''
07: 'true'
08: 'USERNAME@FQDN'
08: 'USERNAME@localhost'
09: 'NULL'
10: 'USER_FULL_NAME'
11: '8000'