Fix reading wrong value when bad file provided.

When a non-existent config file is specified, we print an error message.
Unfortunately, this was attempting to read the filename from the wrong
variable, so a random pointer was being treated as a string.

diff --git a/vswitchd/brcompatd.c b/vswitchd/brcompatd.c
index c74e4f105190cf65f7b895c838e904613dc2fcc0..6e8b18c1b2c5b20ec97de036eb4cc6eb7c367bab 100644 (file)
--- a/vswitchd/brcompatd.c
+++ b/vswitchd/brcompatd.c
@@ -675,7 +675,7 @@ parse_options(int argc, char *argv[])
     error = cfg_set_file(config_file);
     if (error) {
         ofp_fatal(error, "failed to add configuration file \"%s\"", 
-                optarg);
+                config_file);
     }
 }
 

diff --git a/vswitchd/vswitchd.c b/vswitchd/vswitchd.c
index ce0d68e0dd15101f2bf736d080cf006e63123ee5..669a8c42cd11732cc555b5acdc7aa532e0bea7ef 100644 (file)
--- a/vswitchd/vswitchd.c
+++ b/vswitchd/vswitchd.c
@@ -192,7 +192,7 @@ parse_options(int argc, char *argv[])
     error = cfg_set_file(config_file);
     if (error) {
         ofp_fatal(error, "failed to add configuration file \"%s\"", 
-                optarg);
+                config_file);
     }
 }