X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fexecuter.c;h=e72371a8d770416cf754879baed203df3349304d;hb=67a4917b07031b387beafaedce413b4207214059;hp=bc42ccf8693561bec579cb7832ee591dcff587b4;hpb=a5e54d9b6f8002f34cc792df69e6eda68cf95223;p=sliver-openvswitch.git

diff --git a/ofproto/executer.c b/ofproto/executer.c
index bc42ccf86..e72371a8d 100644
--- a/ofproto/executer.c
+++ b/ofproto/executer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -432,7 +432,7 @@ executer_rconn_closing(struct executer *e, struct rconn *rconn)
 }
 
 static void
-sigchld_handler(int signr UNUSED)
+sigchld_handler(int signr OVS_UNUSED)
 {
     write(signal_fds[1], "", 1);
 }
@@ -508,5 +508,7 @@ executer_set_acl(struct executer *e, const char *acl, const char *dir)
     free(e->command_acl);
     e->command_acl = xstrdup(acl);
     free(e->command_dir);
-    e->command_dir = xstrdup(dir);
+    e->command_dir = (dir
+                      ? xstrdup(dir)
+                      : xasprintf("%s/commands", ovs_pkgdatadir));
 }