--- /rc/bin/cpurc.local	Sat May 10 00:16:57 2008
+++ /rc/bin/cpurc.local	Fri Nov  8 23:56:11 2013
@@ -3,7 +3,7 @@
 
 # used only by upas, as default return domain appended to all unqualified
 # return addresses, even local ones
-site=EXAMPLE
+site=DOM.EXAMPLE.COM
 # replace FILESERVER with the name of your file server
 # here we start with kfs, your local disk file system
 fileserver=kfs
--- /rc/bin/termrc.local	Sat May 10 00:22:01 2008
+++ /rc/bin/termrc.local	Fri Nov  8 23:56:06 2013
@@ -3,7 +3,7 @@
 
 # used only by upas, as default return domain appended to all unqualified
 # return addresses, even local ones
-site=plan9
+site=DOM.EXAMPLE.COM
 # replace FILESERVER with the name of your file server
 # here we start with kfs, your local disk file system
 fileserver=kfs
--- /sys/src/cmd/upas/smtp/smtp.c	Thu Oct 10 22:46:23 2013
+++ /sys/src/cmd/upas/smtp/smtp.c	Fri Nov  8 23:54:09 2013
@@ -174,6 +174,8 @@
 		argv++; argc--;
 	} else
 		domain = domainname_read();
+	if(domain == nil)
+		fprint(2, "%s: nil domainname_read()\n", argv0);
 	if(host == 0)
 		host = sysname_read();
 	strcpy(hostdomain, domainify(host, domain));