5 files changed, 42 insertions, 27 deletions

diff --git a/THANKS.in b/THANKS.in
index 9d880e4..4c86411 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -201,3 +201,4 @@ Henning Schmiedehausen
 Markus Baertschi
 Florian Gleixner
 Pawel Malachowski
+Duncan Ferguson
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 8f980a4..51e8e85 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -39,6 +39,9 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 
 #include "common.h"
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index db8ebf9..59c1ecf 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -41,6 +41,22 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 #include "popen.h"
 #include "utils.h"
 
+#ifdef HAVE_DECL_SWAPCTL
+# ifdef HAVE_SYS_SWAP_H
+#  include <sys/swap.h>
+# endif
+# ifdef HAVE_SYS_STAT_H
+#  include <sys/stat.h>
+# endif
+# ifdef HAVE_SYS_PARAM_H
+#  include <sys/param.h>
+# endif
+#endif
+
+#ifndef SWAP_CONVERSION
+# define SWAP_CONVERSION 1
+#endif
+
 int check_swap (int usp, float free_swap_mb);
 int process_arguments (int argc, char **argv);
 int validate_arguments (void);
@@ -236,22 +252,33 @@ main (int argc, char **argv)
 #  ifdef CHECK_SWAP_SWAPCTL_SVR4
 
         /* get the number of active swap devices */
-        nswaps=swapctl(SC_GETNSWP, NULL);
+        if((nswaps=swapctl(SC_GETNSWP, NULL))== -1)
+                die(STATE_UNKNOWN, _("Error getting swap devices\n") );
+
+        if(nswaps == 0)
+                die(STATE_OK, _("SWAP OK: No swap devices defined\n"));
+
+        if(verbose >= 3)
+                printf("Found %d swap device(s)\n", nswaps);
 
         /* initialize swap table + entries */
         tbl=(swaptbl_t*)malloc(sizeof(swaptbl_t)+(sizeof(swapent_t)*nswaps));
+
+        if(tbl==NULL)
+                die(STATE_UNKNOWN, _("malloc() failed!\n"));
+
         memset(tbl, 0, sizeof(swaptbl_t)+(sizeof(swapent_t)*nswaps));
         tbl->swt_n=nswaps;
         for(i=0;i<nswaps;i++){
-                ent=&tbl->swt_ent[i];
-                ent->ste_path=(char*)malloc(sizeof(char)*MAXPATHLEN);
+                if((tbl->swt_ent[i].ste_path=(char*)malloc(sizeof(char)*MAXPATHLEN)) == NULL)
+                        die(STATE_UNKNOWN, _("malloc() failed!\n"));
         }
 
         /* and now, tally 'em up */
         swapctl_res=swapctl(SC_LIST, tbl);
         if(swapctl_res < 0){
                 perror(_("swapctl failed: "));
-                result = STATE_WARNING;
+                die(STATE_UNKNOWN, _("Error in swapctl call\n"));
         }
 
         for(i=0;i<nswaps;i++){
@@ -293,7 +320,7 @@ main (int argc, char **argv)
         swapctl_res=swapctl(SWAP_STATS, ent, nswaps);
         if(swapctl_res < 0){
                 perror(_("swapctl failed: "));
-                result = STATE_WARNING;
+                die(STATE_UNKNOWN, _("Error in swapctl call\n"));
         }
 
         for(i=0;i<nswaps;i++){
diff --git a/plugins/common.h b/plugins/common.h
index ac3b833..b335743 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -36,6 +36,12 @@
 #define _COMMON_H_
 
 #include "config.h"
+/* This needs to be removed for Solaris servers, where 64 bit files, but 32 bit architecture
+   This needs to be done early on because subsequent system includes use _FILE_OFFSET_BITS
+   Cannot remove from config.h because is included by regex.c from lib/ */
+#if __sun__ && !defined(_LP64) && _FILE_OFFSET_BITS == 64
+#undef _FILE_OFFSET_BITS
+#endif
 
 #ifdef HAVE_FEATURES_H
 #include <features.h>
@@ -114,27 +120,6 @@
 #include <locale.h>
 #endif
 
-/* Fixes "Cannot use swapctl in the large files compilation environment" error on Solaris */
-#ifdef _FILE_OFFSET_BITS
-#undef _FILE_OFFSET_BITS
-#endif
-
-#ifdef HAVE_DECL_SWAPCTL
-# ifdef HAVE_SYS_SWAP_H
-#  include <sys/swap.h>
-# endif
-# ifdef HAVE_SYS_STAT_H
-#  include <sys/stat.h>
-# endif
-# ifdef HAVE_SYS_PARAM_H
-#  include <sys/param.h>
-# endif
-#endif
-
-#ifndef SWAP_CONVERSION
-# define SWAP_CONVERSION 1
-#endif
-
 #ifdef HAVE_SYS_POLL_H
 # include "sys/poll.h"
 #endif
diff --git a/plugins/netutils.h b/plugins/netutils.h
index 1168f9f..3fc4ef8 100644
--- a/plugins/netutils.h
+++ b/plugins/netutils.h
@@ -35,7 +35,6 @@
 #ifndef _NETUTILS_H_
 #define _NETUTILS_H_
 
-#include "config.h"
 #include "common.h"
 #include "utils.h"
 #include <netinet/in.h>