diff options
author | Volker Lendecke <vlendec@samba.org> | 2006-03-24 18:40:28 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:15:44 -0500 |
commit | e4878351816d7196efab22b68672430fb61e7b47 (patch) | |
tree | 64204b9d2742a9999d80496814fcb73238cf67e6 /source3/smbd | |
parent | 2036c47c63f68a03639b14f60c2f7031350cd7a7 (diff) | |
download | samba-e4878351816d7196efab22b68672430fb61e7b47.tar.gz samba-e4878351816d7196efab22b68672430fb61e7b47.tar.bz2 samba-e4878351816d7196efab22b68672430fb61e7b47.zip |
r14695: Patch from Björn Jacke:
- add DMAPI/XDSM support for AIX
- find JFS DMAPI libs on Linux when only they are available
Volker
(This used to be commit b6b72f8c6a03001ae75457c9e7a78e189bea5a3f)
Diffstat (limited to 'source3/smbd')
-rw-r--r-- | source3/smbd/dmapi.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source3/smbd/dmapi.c b/source3/smbd/dmapi.c index 2188924d4b..4a6cba293b 100644 --- a/source3/smbd/dmapi.c +++ b/source3/smbd/dmapi.c @@ -24,8 +24,8 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_DMAPI -#if defined(HAVE_LIBDM) -#if (defined(HAVE_XFS_DMAPI_H) || defined(HAVE_SYS_DMI_H)) +#if defined(HAVE_LIBDM) || defined(HAVE_LIBJFSDM) || defined(HAVE_LIBXDSM) +#if defined(HAVE_XFS_DMAPI_H) || defined(HAVE_SYS_DMI_H) || defined(HAVE_SYS_JFSDMAPI_H) || defined(HAVE_SYS_DMAPI_H) #define USE_DMAPI 1 #endif #endif @@ -40,10 +40,12 @@ BOOL dmapi_have_session(void) { return False; } #ifdef HAVE_XFS_DMAPI_H #include <xfs/dmapi.h> -#endif - -#ifdef HAVE_SYS_DMI_H +#elif defined(HAVE_SYS_DMI_H) #include <sys/dmi.h> +#elif defined(HAVE_SYS_JFSDMAPI_H) +#include <sys/jfsdmapi.h> +#elif defined(HAVE_SYS_DMAPI_H) +#include <sys/dmapi.h> #endif #define DMAPI_SESSION_NAME "samba" |