Remove double brackets

textdrive · Jan 7, 2012 · 7b04118 · 7b04118
1 parent 7a7aca2
commit 7b04118
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dhcpd/dhcpd-lib.pl b/dhcpd/dhcpd-lib.pl
@@ -850,7 +850,7 @@ sub restart_dhcpd
 local $out;
 if ($config{'restart_cmd'}) {
 	# Run the restart script
-	$out = &backquote_logged("($config{'restart_cmd'} 2>&1)");
+	$out = &backquote_logged("$config{'restart_cmd'} 2>&1");
 	}
 else {
 	# Kill and re-run the server

diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl
@@ -5620,7 +5620,7 @@ sub backquote_logged
 $cmd .= $and;
 &additional_log('exec', undef, $cmd);
 &webmin_debug_log('CMD', "cmd=$cmd") if ($gconfig{'debug_what_cmd'});
-if ($realcmd !~ /;|\&\&|\|/) {
+if ($realcmd !~ /;|\&\&|\|/ && $realcmd !~ /^\s*\(.*\)\s*$/) {
 	# Force run in shell, to get useful output if command doesn't exist
 	$realcmd = "($realcmd)";
 	}
@@ -5682,7 +5682,7 @@ sub backquote_command
 	}
 my $realcmd = &translate_command($_[0]);
 &webmin_debug_log('CMD', "cmd=$realcmd") if ($gconfig{'debug_what_cmd'});
-if ($realcmd !~ /;|\&\&|\|/) {
+if ($realcmd !~ /;|\&\&|\|/ && $realcmd !~ /^\s*\(.*\)\s*$/) {
 	# Force run in shell, to get useful output if command doesn't exist
 	$realcmd = "($realcmd)";
 	}