Diffstat (limited to 'mcon/U/cf_email.U')
1 files changed, 18 insertions, 7 deletions
diff --git a/mcon/U/cf_email.U b/mcon/U/cf_email.U
index d9d0af8..3eb9606 100644
@@ -1,11 +1,11 @@
-?RCS: $Id: cf_email.U 1 2006-08-24 12:32:52Z rmanfredi $
+?RCS: $Id: cf_email.U 167 2013-05-08 17:58:00Z rmanfredi $
?RCS: Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
-?RCS: You may redistribute only under the terms of the Artistic Licence,
+?RCS: You may redistribute only under the terms of the Artistic License,
?RCS: as specified in the README file that comes with the distribution.
?RCS: You may reuse parts of this distribution only within the terms of
-?RCS: that same Artistic Licence; a copy of which may be found at the root
+?RCS: that same Artistic License; a copy of which may be found at the root
?RCS: of the source tree for dist 4.0.
?RCS: $Log: cf_email.U,v $
@@ -13,13 +13,14 @@
?RCS: patch16: created
-?MAKE:cf_email: cat cf_by myhostname mydomain Oldconfig Myread
+?MAKE:cf_email: cat cf_by test myhostname mydomain Oldconfig Myread
?MAKE: -pick add $@ %<
?S: Electronic mail address of the person who ran Configure. This can be
?S: used by units that require the user's e-mail, like MailList.U.
: determine the e-mail address of the user who is running us
@@ -32,9 +33,19 @@ your organization...
while test "$cont"; do
+ case "$MAILDOMAIN" in
+ if $test -s /etc/mailname; then
+ maildomain=`$cat /etc/mailname`
+ *) maildomain="$MAILDOMAIN";;
case "$cf_email" in
- '') dflt="$cf_by@$myhostname$mydomain";;
- *) dflt="$cf_email";;
+ '') dflt="$cf_by@$maildomain";;
+ *) dflt="$cf_email";;
rp='What is your e-mail address?'