Improved heuristics for Debian.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6a95a356e4bb8c98f539462002e232b252f2ac67..16ca59fc9423f74ce321f32dd16c92eb6ad73772 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-07  Bruno Haible  <bruno@clisp.org>
+
+       * user-email.in: Look at /etc/mailname, found on Debian systems.
+       Suggested by Mark W. Eichin <eichin@thok.org>.
+
 2002-06-07  Bruno Haible  <bruno@clisp.org>
 
        * msgfmt.c (install_sigfpe_handler): Assume the signal is always

diff --git a/src/user-email.in b/src/user-email.in
index 424d3d84d457fa0d5ff457925a27551c41767ce1..1f2f9eed2e74a30f68712ce8e5b301a582cd62aa 100644 (file)
--- a/src/user-email.in
+++ b/src/user-email.in
@@ -217,6 +217,14 @@ if test -n "$files"; then
 
 fi
 
+# Some Debian systems have a file /etc/mailname.
+if test -r /etc/mailname; then
+  hostmailname=`cat /etc/mailname`
+  if test -n "$hostmailname"; then
+    addresses="$addresses ${user}@$hostmailname"
+  fi
+fi
+
 # elm has no user-defined addresses.
 # mailx has no user-defined addresses.
 # mh has no user-defined addresses.