Fix for bad policy install path 51/46051/1
authorRomanKubiak <r.kubiak@samsung.com>
Mon, 10 Aug 2015 15:23:43 +0000 (17:23 +0200)
committerRomanKubiak <r.kubiak@samsung.com>
Thu, 13 Aug 2015 11:09:26 +0000 (13:09 +0200)
Change-Id: I90e8e565d8f9efd46c34833a74cf59012163d6b0

include/nether_Types.h
src/CMakeLists.txt

index 519f21c..d634584 100644 (file)
@@ -181,10 +181,10 @@ struct NetherConfig
        int noRules                                                                     = 0;
        int copyPackets                                                         = NETLINK_COPY_PACKETS;
        std::string backupBackendArgs                           = NETHER_POLICY_FILE;
-       std::string primaryBackendArgs;
-       std::string logBackendArgs;
        std::string rulesPath                                           = NETHER_RULES_PATH;
        std::string iptablesRestorePath                         = NETHER_IPTABLES_RESTORE_PATH;
+       std::string primaryBackendArgs;
+       std::string logBackendArgs;
 };
 
 class NetherVerdictListener
index 634c635..94d39ef 100644 (file)
@@ -78,7 +78,7 @@ TARGET_LINK_LIBRARIES (nether
 )
 
 ADD_DEFINITIONS (-DNETHER_RULES_PATH="${CMAKE_INSTALL_DIR}/etc/nether/nether.rules"
-                                       -DNETHER_POLICY_FILE="${CMAKE_INSTALL_DIR}/etc/nether/nether.rules"
+                                       -DNETHER_POLICY_FILE="${CMAKE_INSTALL_DIR}/etc/nether/nether.policy"
 )
 
 INSTALL (TARGETS nether RUNTIME DESTINATION bin)