]> git.cworth.org Git - notmuch/commitdiff
test: use correct fqdn in passwd_sanitize()
authorFelipe Contreras <felipe.contreras@gmail.com>
Sat, 1 May 2021 11:54:13 +0000 (06:54 -0500)
committerDavid Bremner <david@tethera.net>
Sun, 2 May 2021 00:14:37 +0000 (21:14 -0300)
My fqdn is 'natae.localdomain', however, socket.getfqdn() returns
'localhost'.

To fetch the true fqdn we need socket.getaddrinfo().

For more information see: https://stackoverflow.com/a/11580042/10474

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
test/test-lib.sh

index ae65336350913f26c564b1ba574c365f41cb3d57..21dda2656dd4d54bca9ea0cacc58271c11cad1b5 100644 (file)
@@ -709,7 +709,7 @@ import os, sys, pwd, socket
 pw = pwd.getpwuid(os.getuid())
 user = pw.pw_name
 name = pw.pw_gecos.partition(",")[0]
-fqdn = socket.getfqdn()
+fqdn = socket.getaddrinfo(socket.gethostname(), 0, 0, socket.SOCK_STREAM, 0, socket.AI_CANONNAME)[0][3]
 
 for l in sys.stdin:
     if user: