executer: Make default dir part of executer.c, not main.c.

That way the vswitch can get the default without having to know it too.

diff --git a/secchan/executer.c b/secchan/executer.c
index b321f9812881fd6bef21f488d3653863a989f5b4..5f39c0f50faa192898f1dc3881ea6773dfeda2f9 100644 (file)
--- a/secchan/executer.c
+++ b/secchan/executer.c
@@ -43,6 +43,7 @@
 #include <sys/wait.h>
 #include <string.h>
 #include <unistd.h>
+#include "dirs.h"
 #include "dynamic-string.h"
 #include "fatal-signal.h"
 #include "openflow/nicira-ext.h"
@@ -496,7 +497,9 @@ executer_create(const char *command_acl, const char *command_dir,
 
     e = xcalloc(1, sizeof *e);
     e->command_acl = xstrdup(command_acl);
-    e->command_dir = xstrdup(command_dir);
+    e->command_dir = (command_dir
+                      ? xstrdup(command_dir)
+                      : xasprintf("%s/commands", ofp_pkgdatadir));
     e->n_children = 0;
     *executerp = e;
     return 0;

diff --git a/secchan/main.c b/secchan/main.c
index d0bb73a468018e6976ad6c56d9e2eacbad23579d..437796171c813f6aa7f7b883a8fd7a23df69764b 100644 (file)
--- a/secchan/main.c
+++ b/secchan/main.c
@@ -315,7 +315,7 @@ parse_options(int argc, char *argv[], struct ofsettings *s)
     s->enable_stp = false;
     s->in_band = true;
     s->command_acl = "";
-    s->command_dir = xasprintf("%s/commands", ofp_pkgdatadir);
+    s->command_dir = NULL;
     for (;;) {
         int error;
         int c;