mirror/zoneminder
1
0 Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-10-11 20:26:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #458 from knnniggett/arp

Browse Source 
Determine full path to arp
This commit is contained in:
Andrew Bauer committed 2014-07-05 11:17:48 -05:00
2 parents c2e2a12995 48d961082c
commit 691791c647
2 files changed
+18 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

web/skins/classic/views/monitorprobe.php
+9 -1
View File
@@ -287,7 +287,15 @@ $macBases = array(
);
unset($output);
$command = "arp -a";
// Calling arp without the full path was reported to fail on some systems
// Use the builtin unix command "type" to tell us where the command is
$command = "type -p arp";
$result = exec( escapeshellcmd($command), $output, $status );
if ( $status )
Fatal( "Unable determine arp path, status is '$status'" );
// Now that we know where arp is, call it using the full path
$command = $output[0]." -a";
unset($output);
$result = exec( escapeshellcmd($command), $output, $status );
if ( $status )
Fatal( "Unable to probe network cameras, status is '$status'" );
web/skins/flat/views/monitorprobe.php
+9 -1
View File
@@ -287,7 +287,15 @@ $macBases = array(
);
unset($output);
$command = "arp -a";
// Calling arp without the full path was reported to fail on some systems
// Use the builtin unix command "type" to tell us where the command is
$command = "type -p arp";
$result = exec( escapeshellcmd($command), $output, $status );
if ( $status )
Fatal( "Unable determine arp path, status is '$status'" );
// Now that we know where arp is, call it using the full path
$command = $output[0]." -a";
unset($output);
$result = exec( escapeshellcmd($command), $output, $status );
if ( $status )
Fatal( "Unable to probe network cameras, status is '$status'" );