mxrouter: Fix config file read errors

A value in $_ (errno) is not an indication for a file read error. Check return value of "do" for undef.
mariux64 · Mar 17, 2018 · 2b1a064 · 2b1a064
1 parent b071ee8
commit 2b1a064
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/mxrouter/mxrouterctl b/mxrouter/mxrouterctl
@@ -567,9 +567,10 @@ unless (-e $CONFIG_FILE) {
 	exit;
 }
 
-do $CONFIG_FILE;
-$@ and die "$CONFIG_FILE: $@\n";
-$! and die "$CONFIG_FILE: $!\n";
+unless (defined do "$CONFIG_FILE") {
+	die "$CONFIG_FILE: $@\n" if $@;
+	die "$CONFIG_FILE: $!\n";
+}
 
 sub dhcrelay_forward {
 	my ($ip)=@_;