From 267357899ffef3bbe75f4598916bd4d967a99c67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Pierre=20Andr=C3=A9?= Date: Wed, 30 Sep 2015 08:44:56 +0200 Subject: [PATCH] Made secaudit to load the library based on its generic name When compiled autonomously without the automatically generated dynamic link stubs, use a generic library name instead of a version dependent one. (obsolete compile mode rarely used). --- src/secaudit.c | 5 ++++- src/secaudit.h | 9 +++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/secaudit.c b/src/secaudit.c index af408878..dbde0ca4 100644 --- a/src/secaudit.c +++ b/src/secaudit.c @@ -218,6 +218,9 @@ * * Mar 2015, version 1.4.5 * - adapted to new NTFS ACLs when owner is same as group + * + * May 2015, version 1.4.6 + * - made to load shared library based on generic name */ /* @@ -241,7 +244,7 @@ * General parameters which may have to be adapted to needs */ -#define AUDT_VERSION "1.4.5" +#define AUDT_VERSION "1.4.6" #define GET_FILE_SECURITY "ntfs_get_file_security" #define SET_FILE_SECURITY "ntfs_set_file_security" diff --git a/src/secaudit.h b/src/secaudit.h index a8ad163f..a5cb91b3 100644 --- a/src/secaudit.h +++ b/src/secaudit.h @@ -56,8 +56,13 @@ #else #define USESTUBS 0 /* direct calls to API, based on following definitions */ #define ENVNTFS3G "NTFS3G" -#define LIBFILE64 "/lib64/libntfs-3g.so.4921" -#define LIBFILE "/lib/libntfs-3g.so.4921" +#if defined(__SVR4) +#define LIBFILE64 "/usr/lib/amd64/libntfs-3g.so" +#define LIBFILE "/usr/lib/libntfs-3g.so" +#else +#define LIBFILE64 "/lib64/libntfs-3g.so" +#define LIBFILE "/lib/libntfs-3g.so" +#endif #endif #define MAPDIR ".NTFS-3G"