Correct rebasing error

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
ros2 · Jan 28, 2020 · b6a7608 · b6a7608
1 parent 92ec502
commit b6a7608
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/rmw/CMakeLists.txt b/rmw/CMakeLists.txt
@@ -32,7 +32,7 @@ set(rmw_sources
   "src/init_options.c"
   "src/loaned_message_sequence.c"
   "src/names_and_types.c"
-  "src/node_security_options.c"
+  "src/security_options.c"
   "src/publisher_options.c"
   "src/sanity_checks.c"
   "src/security_options.c"

diff --git a/rmw/src/security_options.c b/rmw/src/security_options.c
@@ -31,7 +31,8 @@ rmw_get_default_security_options()
 {
   rmw_security_options_t default_options = {
     RMW_SECURITY_ENFORCEMENT_PERMISSIVE,
-    NULL};
+    NULL,
+  };
   return default_options;
 }