diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-06-04 11:13:05 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-06-04 11:13:05 +1000 |
| commit | bef665baadebe7ad8a9417dfccb5f210d3f01ae0 (patch) | |
| tree | 69758f5d269d8458be0a76f16b6049b44031ad06 | |
| parent | 0daf9a042c76619f4be8ce38b6ee1aba6a1079a4 (diff) | |
| download | samba-bef665baadebe7ad8a9417dfccb5f210d3f01ae0.tar.gz samba-bef665baadebe7ad8a9417dfccb5f210d3f01ae0.tar.bz2 samba-bef665baadebe7ad8a9417dfccb5f210d3f01ae0.zip | |
s4:torture Make Samba4 build on hosts with an older libnetapi
For example, Samba4 would not build (for the last week) on Fedora 10,
with samba-common 3.2.11 installed.
Andrew Bartlett
| -rw-r--r-- | source4/torture/libnetapi/config.m4 | 7 | ||||
| -rw-r--r-- | source4/torture/torture.c | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source4/torture/libnetapi/config.m4 b/source4/torture/libnetapi/config.m4 index fadef6981c..402f1123a5 100644 --- a/source4/torture/libnetapi/config.m4 +++ b/source4/torture/libnetapi/config.m4 @@ -20,7 +20,12 @@ SMB_ENABLE(TORTURE_LIBNETAPI,NO) if test x$use_netapi != xno; then AC_CHECK_HEADERS(netapi.h) AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, libnetapi_init) - if test x"$ac_cv_header_netapi_h" = x"yes" -a x"$ac_cv_lib_ext_netapi_libnetapi_init" = x"yes";then + AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, NetUserModalsGet) + AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, NetUserGetGroups) + AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, NetUserGetInfo) + AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, NetUserSetInfo) + if test x"$ac_cv_header_netapi_h" = x"yes" -a x"$ac_cv_lib_ext_netapi_libnetapi_init" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserModalsGet" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserGetGroups" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserGetInfo" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserSetInfo" = x"yes";then + AC_DEFINE(ENABLE_LIBNETAPI,1,[Whether we have libnetapi on the host system]) SMB_ENABLE(NETAPI,YES) SMB_ENABLE(TORTURE_LIBNETAPI,YES) else diff --git a/source4/torture/torture.c b/source4/torture/torture.c index d80acffa0d..a7296e62db 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -45,7 +45,7 @@ bool torture_register_suite(struct torture_suite *suite) return torture_suite_add_suite(torture_root, suite); } -#ifndef HAVE_NETAPI_H +#ifndef ENABLE_LIBNETAPI NTSTATUS torture_libnetapi_init(void) { return NT_STATUS_OK; @@ -63,9 +63,7 @@ _PUBLIC_ int torture_init(void) extern NTSTATUS torture_rpc_init(void); extern NTSTATUS torture_smb2_init(void); extern NTSTATUS torture_net_init(void); -#ifdef HAVE_NETAPI_H extern NTSTATUS torture_libnetapi_init(void); -#endif extern NTSTATUS torture_raw_init(void); extern NTSTATUS torture_unix_init(void); extern NTSTATUS torture_winbind_init(void); |