diff --git a/sm5/smartd.c b/sm5/smartd.c
index dde76b7d8ff421b4036b67ee097f1aee2f40445c..7084c846adec2249c4cf4d6bf962de1040db8e6b 100644
--- a/sm5/smartd.c
+++ b/sm5/smartd.c
@@ -95,7 +95,7 @@ typedef int pid_t;
 extern const char *atacmdnames_c_cvsid, *atacmds_c_cvsid, *ataprint_c_cvsid, *escalade_c_cvsid, 
                   *knowndrives_c_cvsid, *os_XXXX_c_cvsid, *scsicmds_c_cvsid, *utility_c_cvsid;
 
-static const char *filenameandversion="$Id: smartd.c,v 1.301 2004/04/05 09:41:44 guidog Exp $";
+static const char *filenameandversion="$Id: smartd.c,v 1.302 2004/04/05 15:14:11 ballen4705 Exp $";
 #ifdef NEED_SOLARIS_ATA_CODE
 extern const char *os_solaris_ata_s_cvsid;
 #endif
@@ -106,7 +106,7 @@ extern const char *syslog_win32_c_cvsid;
 extern const char *int64_vc6_c_cvsid;
 #endif
 #endif
-const char *smartd_c_cvsid="$Id: smartd.c,v 1.301 2004/04/05 09:41:44 guidog Exp $" 
+const char *smartd_c_cvsid="$Id: smartd.c,v 1.302 2004/04/05 15:14:11 ballen4705 Exp $" 
 ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID
 KNOWNDRIVES_H_CVSID SCSICMDS_H_CVSID SMARTD_H_CVSID
 #ifdef SYSLOG_H_CVSID
@@ -437,18 +437,17 @@ int exportenv(char* stackspace, const char *name, const char *value){
   return putenv(stackspace);
 }
 
-char* dnsdomain(const char* hostname)
-{
-    char *p = NULL;
+char* dnsdomain(const char* hostname) {
+  char *p = NULL;
 #ifdef HAVE_GETHOSTBYNAME
-    struct hostent *hp;
-
-    if ((hp = gethostbyname(hostname))) {
-       	if ((p = strchr(hp->h_name, '.')))
-	   p++; // skip "."
-    }
-    return p;
+  struct hostent *hp;
+  
+  if ((hp = gethostbyname(hostname))) {
+    if ((p = strchr(hp->h_name, '.')))
+      p++; // skip "."
+  }
 #endif
+  return p;
 }
 
 #define EBUFLEN 1024
@@ -539,19 +538,20 @@ void MailWarning(cfgfile *cfg, int which, char *fmt, ...){
   if (gethostname(hostname, 256))
     sprintf(hostname,"Unknown host");
   else {
+    char *p=NULL;
     hostname[255]='\0';
-    char* p = dnsdomain(hostname);
-    if(p) {
-	strncpy(domainname, p, 255);
-        domainname[255]='\0';
+    p = dnsdomain(hostname);
+    if (p) {
+      strncpy(domainname, p, 255);
+      domainname[255]='\0';
     } else
-	strcpy(domainname, "Unknown domain");
+      strcpy(domainname, "Unknown domain");
   }
 #else
   sprintf(hostname,"Unknown host");
   strcpy(domainname, "Unknown domain");
 #endif
-
+  
 #ifdef HAVE_GETDOMAINNAME
   if (getdomainname(nisdomain, 256))
     sprintf(nisdomain,"Unknown NIS domain");
@@ -644,7 +644,7 @@ void MailWarning(cfgfile *cfg, int which, char *fmt, ...){
              "$SMARTD_MAILER -s '%s' %s 2>&1 << \"ENDMAIL\"\n"
              "This email was generated by the smartd daemon running on host:\n"
              "%s\n"
-             "in the domain:\n"
+             "in the DNS domain:\n"
              "%s\n"
 	     "in the NIS domain:\n"
 	     "%s\n"
diff --git a/sm5/smartd.cpp b/sm5/smartd.cpp
index b3eb39d5f665d23991ead6d6cc58e76b0cfdae5b..f0f8bac88f6a617b718adc363ad418fe73d53f95 100644
--- a/sm5/smartd.cpp
+++ b/sm5/smartd.cpp
@@ -95,7 +95,7 @@ typedef int pid_t;
 extern const char *atacmdnames_c_cvsid, *atacmds_c_cvsid, *ataprint_c_cvsid, *escalade_c_cvsid, 
                   *knowndrives_c_cvsid, *os_XXXX_c_cvsid, *scsicmds_c_cvsid, *utility_c_cvsid;
 
-static const char *filenameandversion="$Id: smartd.cpp,v 1.301 2004/04/05 09:41:44 guidog Exp $";
+static const char *filenameandversion="$Id: smartd.cpp,v 1.302 2004/04/05 15:14:11 ballen4705 Exp $";
 #ifdef NEED_SOLARIS_ATA_CODE
 extern const char *os_solaris_ata_s_cvsid;
 #endif
@@ -106,7 +106,7 @@ extern const char *syslog_win32_c_cvsid;
 extern const char *int64_vc6_c_cvsid;
 #endif
 #endif
-const char *smartd_c_cvsid="$Id: smartd.cpp,v 1.301 2004/04/05 09:41:44 guidog Exp $" 
+const char *smartd_c_cvsid="$Id: smartd.cpp,v 1.302 2004/04/05 15:14:11 ballen4705 Exp $" 
 ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID
 KNOWNDRIVES_H_CVSID SCSICMDS_H_CVSID SMARTD_H_CVSID
 #ifdef SYSLOG_H_CVSID
@@ -437,18 +437,17 @@ int exportenv(char* stackspace, const char *name, const char *value){
   return putenv(stackspace);
 }
 
-char* dnsdomain(const char* hostname)
-{
-    char *p = NULL;
+char* dnsdomain(const char* hostname) {
+  char *p = NULL;
 #ifdef HAVE_GETHOSTBYNAME
-    struct hostent *hp;
-
-    if ((hp = gethostbyname(hostname))) {
-       	if ((p = strchr(hp->h_name, '.')))
-	   p++; // skip "."
-    }
-    return p;
+  struct hostent *hp;
+  
+  if ((hp = gethostbyname(hostname))) {
+    if ((p = strchr(hp->h_name, '.')))
+      p++; // skip "."
+  }
 #endif
+  return p;
 }
 
 #define EBUFLEN 1024
@@ -539,19 +538,20 @@ void MailWarning(cfgfile *cfg, int which, char *fmt, ...){
   if (gethostname(hostname, 256))
     sprintf(hostname,"Unknown host");
   else {
+    char *p=NULL;
     hostname[255]='\0';
-    char* p = dnsdomain(hostname);
-    if(p) {
-	strncpy(domainname, p, 255);
-        domainname[255]='\0';
+    p = dnsdomain(hostname);
+    if (p) {
+      strncpy(domainname, p, 255);
+      domainname[255]='\0';
     } else
-	strcpy(domainname, "Unknown domain");
+      strcpy(domainname, "Unknown domain");
   }
 #else
   sprintf(hostname,"Unknown host");
   strcpy(domainname, "Unknown domain");
 #endif
-
+  
 #ifdef HAVE_GETDOMAINNAME
   if (getdomainname(nisdomain, 256))
     sprintf(nisdomain,"Unknown NIS domain");
@@ -644,7 +644,7 @@ void MailWarning(cfgfile *cfg, int which, char *fmt, ...){
              "$SMARTD_MAILER -s '%s' %s 2>&1 << \"ENDMAIL\"\n"
              "This email was generated by the smartd daemon running on host:\n"
              "%s\n"
-             "in the domain:\n"
+             "in the DNS domain:\n"
              "%s\n"
 	     "in the NIS domain:\n"
 	     "%s\n"