ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #458 from knnniggett/arp 

Determine full path to arp
pull/459/head
Andrew Bauer 2014-07-05 11:17:48 -05:00
parent c2e2a12995 48d961082c
commit 691791c647
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/skins/classic/views/monitorprobe.php
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'" );

10
web/skins/flat/views/monitorprobe.php
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'" );