From 1e76bc2c62376512712008ccc91d6aac937b8756 Mon Sep 17 00:00:00 2001 From: ballen4705 <ballen4705@4ea69e1a-61f1-4043-bf83-b5c94c648137> Date: Wed, 7 Apr 2004 17:43:47 +0000 Subject: [PATCH] Consistent messages if host not recognized git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@1651 4ea69e1a-61f1-4043-bf83-b5c94c648137 --- sm5/smartd.c | 17 +++++++++-------- sm5/smartd.cpp | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/sm5/smartd.c b/sm5/smartd.c index 7131530bd..82584fb5d 100644 --- a/sm5/smartd.c +++ b/sm5/smartd.c @@ -98,7 +98,7 @@ int getdomainname(char *, int); /* no declaration in header files! */ 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.304 2004/04/07 16:41:43 card_captor Exp $"; +static const char *filenameandversion="$Id: smartd.c,v 1.305 2004/04/07 17:43:47 ballen4705 Exp $"; #ifdef NEED_SOLARIS_ATA_CODE extern const char *os_solaris_ata_s_cvsid; #endif @@ -109,7 +109,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.304 2004/04/07 16:41:43 card_captor Exp $" +const char *smartd_c_cvsid="$Id: smartd.c,v 1.305 2004/04/07 17:43:47 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 @@ -485,6 +485,7 @@ void MailWarning(cfgfile *cfg, int which, char *fmt, ...){ maildata* data=cfg->mailwarn; FILE *pfp=NULL; char *newadd=NULL, *newwarn=NULL; + const char *unknown="[Unknown]"; // See if user wants us to send mail if (!data) @@ -541,7 +542,7 @@ void MailWarning(cfgfile *cfg, int which, char *fmt, ...){ // get system host & domain names (not null terminated if length=MAX) #ifdef HAVE_GETHOSTNAME if (gethostname(hostname, 256)) - sprintf(hostname,"Unknown host"); + sprintf(hostname, unknown); else { char *p=NULL; hostname[255]='\0'; @@ -550,20 +551,20 @@ void MailWarning(cfgfile *cfg, int which, char *fmt, ...){ strncpy(domainname, p, 255); domainname[255]='\0'; } else - strcpy(domainname, "Unknown domain"); + strcpy(domainname, unknown); } #else - sprintf(hostname,"Unknown host"); - strcpy(domainname, "Unknown domain"); + sprintf(hostname, unknown); + strcpy(domainname, unknown); #endif #ifdef HAVE_GETDOMAINNAME if (getdomainname(nisdomain, 256)) - sprintf(nisdomain,"Unknown NIS domain"); + sprintf(nisdomain, unknown); else nisdomain[255]='\0'; #else - sprintf(nisdomain,"Unknown NIS domain"); + sprintf(nisdomain, unknown); #endif // print warning string into message diff --git a/sm5/smartd.cpp b/sm5/smartd.cpp index 2338b9ef3..73f5595a0 100644 --- a/sm5/smartd.cpp +++ b/sm5/smartd.cpp @@ -98,7 +98,7 @@ int getdomainname(char *, int); /* no declaration in header files! */ 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.304 2004/04/07 16:41:43 card_captor Exp $"; +static const char *filenameandversion="$Id: smartd.cpp,v 1.305 2004/04/07 17:43:47 ballen4705 Exp $"; #ifdef NEED_SOLARIS_ATA_CODE extern const char *os_solaris_ata_s_cvsid; #endif @@ -109,7 +109,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.304 2004/04/07 16:41:43 card_captor Exp $" +const char *smartd_c_cvsid="$Id: smartd.cpp,v 1.305 2004/04/07 17:43:47 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 @@ -485,6 +485,7 @@ void MailWarning(cfgfile *cfg, int which, char *fmt, ...){ maildata* data=cfg->mailwarn; FILE *pfp=NULL; char *newadd=NULL, *newwarn=NULL; + const char *unknown="[Unknown]"; // See if user wants us to send mail if (!data) @@ -541,7 +542,7 @@ void MailWarning(cfgfile *cfg, int which, char *fmt, ...){ // get system host & domain names (not null terminated if length=MAX) #ifdef HAVE_GETHOSTNAME if (gethostname(hostname, 256)) - sprintf(hostname,"Unknown host"); + sprintf(hostname, unknown); else { char *p=NULL; hostname[255]='\0'; @@ -550,20 +551,20 @@ void MailWarning(cfgfile *cfg, int which, char *fmt, ...){ strncpy(domainname, p, 255); domainname[255]='\0'; } else - strcpy(domainname, "Unknown domain"); + strcpy(domainname, unknown); } #else - sprintf(hostname,"Unknown host"); - strcpy(domainname, "Unknown domain"); + sprintf(hostname, unknown); + strcpy(domainname, unknown); #endif #ifdef HAVE_GETDOMAINNAME if (getdomainname(nisdomain, 256)) - sprintf(nisdomain,"Unknown NIS domain"); + sprintf(nisdomain, unknown); else nisdomain[255]='\0'; #else - sprintf(nisdomain,"Unknown NIS domain"); + sprintf(nisdomain, unknown); #endif // print warning string into message -- GitLab