fix(userspace/libsinsp): solve user resolution issues with musl

Signed-off-by: Jason Dellaluce <[email protected]>
falcosecurity · Oct 21, 2023 · faebb36 · faebb36
1 parent 3a41d14
commit faebb36
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/userspace/libsinsp/CMakeLists.txt b/userspace/libsinsp/CMakeLists.txt
@@ -29,6 +29,9 @@ if(NOT MSVC)
 	endif()
 	add_definitions(-DHAVE_PWD_H)
 	add_definitions(-DHAVE_GRP_H)
+	if(MUSL_OPTIMIZED_BUILD)
+		add_definitions(-DMUSL_OPTIMIZED)
+	endif()
 endif()
 
 if(NOT DEFINED CHISEL_TOOL_LIBRARY_NAME)

diff --git a/userspace/libsinsp/test/user.ut.cpp b/userspace/libsinsp/test/user.ut.cpp
@@ -169,12 +169,12 @@ class usergroup_manager_host_root_test : public sinsp_with_test_input
 
 		{
 			std::ofstream ofs(etc + "/passwd");
-			ofs << "toor:x:0:0:toor:/toor:/bin/ash";
+			ofs << "toor:x:0:0:toor:/toor:/bin/ash" << std::endl;
 			ofs.close();
 		}
 		{
 			std::ofstream ofs(etc + "/group");
-			ofs << "toor:x:0:toor";
+			ofs << "toor:x:0:toor" << std::endl;
 			ofs.close();
 		}
 	}

diff --git a/userspace/libsinsp/user.cpp b/userspace/libsinsp/user.cpp
@@ -38,7 +38,7 @@ limitations under the License.
 // See fgetpwent() / fgetgrent() feature test macros:
 // https://man7.org/linux/man-pages/man3/fgetpwent.3.html
 // https://man7.org/linux/man-pages/man3/fgetgrent.3.html
-#if defined _DEFAULT_SOURCE || defined _SVID_SOURCE
+#if defined(MUSL_OPTIMIZED) || defined(_DEFAULT_SOURCE) || defined(_SVID_SOURCE)
 #define HAVE_FGET__ENT
 #endif