Merge branch 'master' into check_dhcp_rogue_detection

2 files changed, 3 insertions, 4 deletions

diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl
index f4d33a7b..eda8dd48 100644
--- a/plugins-scripts/check_disk_smb.pl
+++ b/plugins-scripts/check_disk_smb.pl
@@ -226,7 +226,8 @@ if (/\s*(\d*) blocks of size (\d*)\. (\d*) blocks available/) {
         my ($total_bytes) = $1 * $2;
         my ($occupied_bytes) = $1 * $2 - $avail_bytes;
         my ($avail) = $avail_bytes/1024;
-        my ($capper) = int(($3/$1)*100);
+        my ($capper);
+        if ($1!=0) { $capper = int(($3/$1)*100) } else { $capper=100 };
         my ($mountpt) = "\\\\$host\\$share";
 
         # TODO : why is the kB the standard unit for args ?
diff --git a/plugins-scripts/check_ircd.pl b/plugins-scripts/check_ircd.pl
index 84f20229..4822fe68 100755
--- a/plugins-scripts/check_ircd.pl
+++ b/plugins-scripts/check_ircd.pl
@@ -146,7 +146,6 @@ sub bindRemote ($$)
 {
         my ($in_remotehost, $in_remoteport) = @_;
         my $proto = getprotobyname('tcp');
-        my $sockaddr;
         my $that;
         my ($name, $aliases,$type,$len,$thataddr) = gethostbyname($in_remotehost);
 
@@ -154,8 +153,7 @@ sub bindRemote ($$)
             print "IRCD UNKNOWN: Could not start socket ($!)\n";
             exit $ERRORS{"UNKNOWN"};
         }
-        $sockaddr = 'S n a4 x8';
-        $that = pack($sockaddr, AF_INET, $in_remoteport, $thataddr);
+        $that = pack_sockaddr_in ($in_remoteport, $thataddr);
         if (!connect(ClientSocket, $that)) { 
             print "IRCD UNKNOWN: Could not connect socket ($!)\n";
             exit $ERRORS{"UNKNOWN"};