Fix two Solaris compile problems

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1462 f882894a-f735-0410-b71e-b25c423dba1c

diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index 528298e5db29290756acd9a1eda88ad1bdbcbda9..069d0c4df307e30e82de1707b7285106d478f34a 100644 (file)
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -1196,7 +1196,7 @@ static int dl_bind(int fd, int sap, u_char *addr){
        bind_req->dl_xidtest_flg = 0;
        put_ctrl(fd, sizeof(dl_bind_req_t), 0);
        get_msg(fd);
-       if GOT_ERR == check_ctrl(DL_BIND_ACK)){
+       if (GOT_ERR == check_ctrl(DL_BIND_ACK)){
                printf(_("Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n"), strerror(errno));
                exit(STATE_UNKNOWN);
                }

diff --git a/plugins/common.h b/plugins/common.h
index 47252aa42134ca7a44a0e0806f6cde1e7941bca7..ac3b8339d9d50849f64d1e50c5b74eed0abafea7 100644 (file)
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -114,6 +114,11 @@
 #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>