Merge branch 'maint-1.2' into maint-1.3

 Conflicts:
	src/OVAL/probes/fsdev.c
	tests/API/probes/Makefile.am

Author: jan-cerny

src/OVAL/probes/fsdev.c

@@ -77,7 +77,7 @@ static int fsdev_cmp(const void *a, const void *b)
 #define DEVID_ARRAY_ADD  8
 
 #if defined(OS_LINUX)
-int is_local_fs(struct mntent *ment)
+static int is_local_fs(struct mntent *ment)
 {
 // todo: would it be usefull to provide the choice during build-time?
 #if 1
@@ -127,7 +127,7 @@ int is_local_fs(struct mntent *ment)
 }
 
 #elif defined(OS_AIX)
-int is_local_fs(struct mntent *ment)
+static int is_local_fs(struct mntent *ment)
 {
 	int i;
 	struct vfs_ent *e;

src/OVAL/probes/fsdev.h

@@ -85,14 +85,4 @@ int fsdev_path(fsdev_t *lfs, const char *path);
  */
 int fsdev_fd(fsdev_t *lfs, int fd);
 
-#if defined(__linux__) || defined(_AIX)
-/**
- * Detemines whether a given mtab entry is a local file system.
- * @param ment Structure returned by getmntent (see `man 3 getmntent`).
- * @retval 1 if local
- * @retval 0 otherwise
- */
-int is_local_fs(struct mntent *ment);
-#endif
-
 #endif				/* FSDEV_H */

tests/API/probes/CMakeLists.txt

@@ -10,7 +10,6 @@ target_include_directories(test_api_probes_smoke PUBLIC
 )
 add_oscap_test_executable(test_fsdev_is_local_fs
 	"test_fsdev_is_local_fs.c"
-	"${CMAKE_SOURCE_DIR}/src/OVAL/probes/fsdev.c"
 )
 target_include_directories(test_fsdev_is_local_fs PUBLIC
 	"${CMAKE_SOURCE_DIR}/src/OVAL/probes"

tests/API/probes/test_fsdev_is_local_fs.c

@@ -28,6 +28,7 @@
 #include <string.h>
 #include <mntent.h>
 #include "fsdev.h"
+#include "fsdev.c"
 
 static int test_single_call()
 {