Skip to content

Commit

Permalink
Crashfix in greyhole-dfree; trying to use a function defined in greyh…
Browse files Browse the repository at this point in the history
…ole file!
  • Loading branch information
gboudreau committed Feb 9, 2014
1 parent 773c095 commit 292341e
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions includes/common.php
Original file line number Diff line number Diff line change
Expand Up @@ -281,11 +281,7 @@ function parse_config() {
return FALSE;
}

$testparm_exe = 'testparm';
if (gh_file_exists('/usr/bin/testparm')) {
$testparm_exe = '/usr/bin/testparm';
}
exec($testparm_exe . ' -s ' . escapeshellarg($smb_config_file) . ' 2> /dev/null', $config_text);
exec('testparm -s ' . escapeshellarg($smb_config_file) . ' 2> /dev/null', $config_text);
foreach ($config_text as $line) {
$line = trim($line);
if (mb_strlen($line) == 0) { continue; }
Expand Down

0 comments on commit 292341e

Please sign in to comment.