From 7d3fb49d19780b38341e1a652f351c2ae76cb42d Mon Sep 17 00:00:00 2001
From: ballen4705 <ballen4705@4ea69e1a-61f1-4043-bf83-b5c94c648137>
Date: Mon, 13 Oct 2003 13:09:57 +0000
Subject: [PATCH] Added AC check for getdomainname() which is not available on
solaris
git-svn-id: https://smartmontools.svn.sourceforge.net/svnroot/smartmontools/trunk@1112 4ea69e1a-61f1-4043-bf83-b5c94c648137
---
sm5/configure.in | 5 +++--
sm5/smartd.c | 9 +++++++--
sm5/smartd.cpp | 9 +++++++--
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/sm5/configure.in b/sm5/configure.in
index 8bc9e6e83..a666be085 100644
--- a/sm5/configure.in
+++ b/sm5/configure.in
@@ -1,5 +1,5 @@
#
-# $Id: configure.in,v 1.22 2003/10/12 20:19:16 arvoreen Exp $
+# $Id: configure.in,v 1.23 2003/10/13 13:09:57 ballen4705 Exp $
#
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
@@ -7,7 +7,7 @@ AC_INIT(smartmontools, 5.21, smartmontools-support@lists.sourceforge.net)
AC_CONFIG_SRCDIR(smartctl.c)
smartmontools_configure_date=`date -u +"%Y/%m/%d %T %Z"`
-smartmontools_cvs_tag=`echo '$Id: configure.in,v 1.22 2003/10/12 20:19:16 arvoreen Exp $'`
+smartmontools_cvs_tag=`echo '$Id: configure.in,v 1.23 2003/10/13 13:09:57 ballen4705 Exp $'`
AC_DEFINE_UNQUOTED(SMARTMONTOOLS_CONFIGURE_ARGS, "$ac_configure_args", [smartmontools Configure Arguments])
AC_DEFINE_UNQUOTED(SMARTMONTOOLS_CONFIGURE_DATE, "$smartmontools_configure_date", [smartmontools Configure Date])
@@ -35,6 +35,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
dnl Checks for library functions.
AC_CHECK_FUNCS([getopt])
AC_CHECK_FUNCS([getopt_long])
+AC_CHECK_FUNCS([getdomainname])
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
diff --git a/sm5/smartd.c b/sm5/smartd.c
index 2ac716282..44b0acf69 100644
--- a/sm5/smartd.c
+++ b/sm5/smartd.c
@@ -53,7 +53,7 @@
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;
-const char *smartd_c_cvsid="$Id: smartd.c,v 1.215 2003/10/13 12:43:22 ballen4705 Exp $"
+const char *smartd_c_cvsid="$Id: smartd.c,v 1.216 2003/10/13 13:09:57 ballen4705 Exp $"
ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID KNOWNDRIVES_H_CVSID
SCSICMDS_H_CVSID SMARTD_H_CVSID UTILITY_H_CVSID;
@@ -324,10 +324,15 @@ void PrintAndMail(cfgfile *cfg, int which, int priority, char *fmt, ...){
sprintf(hostname,"Unknown host");
else
hostname[255]='\0';
+
+#ifdef HAVE_GETDOMAINNAME
if (getdomainname(domainname, 256))
- sprintf(hostname,"Unknown domain");
+ sprintf(domainname,"Unknown");
else
domainname[255]='\0';
+#else
+ sprintf(domainname,"Unknown");
+#endif
// print warning string into message
va_start(ap, fmt);
diff --git a/sm5/smartd.cpp b/sm5/smartd.cpp
index 3862669bd..737cc9384 100644
--- a/sm5/smartd.cpp
+++ b/sm5/smartd.cpp
@@ -53,7 +53,7 @@
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;
-const char *smartd_c_cvsid="$Id: smartd.cpp,v 1.215 2003/10/13 12:43:22 ballen4705 Exp $"
+const char *smartd_c_cvsid="$Id: smartd.cpp,v 1.216 2003/10/13 13:09:57 ballen4705 Exp $"
ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID KNOWNDRIVES_H_CVSID
SCSICMDS_H_CVSID SMARTD_H_CVSID UTILITY_H_CVSID;
@@ -324,10 +324,15 @@ void PrintAndMail(cfgfile *cfg, int which, int priority, char *fmt, ...){
sprintf(hostname,"Unknown host");
else
hostname[255]='\0';
+
+#ifdef HAVE_GETDOMAINNAME
if (getdomainname(domainname, 256))
- sprintf(hostname,"Unknown domain");
+ sprintf(domainname,"Unknown");
else
domainname[255]='\0';
+#else
+ sprintf(domainname,"Unknown");
+#endif
// print warning string into message
va_start(ap, fmt);
--
GitLab