s3: Remove header==NULL code from db_ctdb_marshall_record
[kai/samba.git] / source3 / wscript
index 901d2b6fca82479ae4999f552f36f795d6a8b82d..9a1cd684fd73e2cb9319b5d230194993663d7d4d 100644 (file)
@@ -21,24 +21,19 @@ def set_options(opt):
     opt.add_option('--with-shared-modules',
                    help=("Comma-separated list of names of modules to build shared"),
                    action="store", dest='shared_modules', default=None)
-    opt.add_option('--enable-selftest',
-                  help=("enable options necessary for selftest"),
-                  action="store_true", dest='enable_selftest', default=False)
 
     opt.SAMBA3_ADD_OPTION('winbind')
     opt.SAMBA3_ADD_OPTION('swat')
-    opt.SAMBA3_ADD_OPTION('ads')
-    opt.SAMBA3_ADD_OPTION('mit-krb5-checks', default=False)
+    opt.SAMBA3_ADD_OPTION('ads', default=None) # None means autodetection
     opt.SAMBA3_ADD_OPTION('ldap')
     opt.SAMBA3_ADD_OPTION('cups', with_name="enable", without_name="disable")
     opt.SAMBA3_ADD_OPTION('iprint', with_name="enable", without_name="disable")
     opt.SAMBA3_ADD_OPTION('pam')
     opt.SAMBA3_ADD_OPTION('pam_smbpass')
     opt.SAMBA3_ADD_OPTION('quotas')
-    opt.SAMBA3_ADD_OPTION('sys-quotas')
     opt.SAMBA3_ADD_OPTION('sendfile-support')
     opt.SAMBA3_ADD_OPTION('utmp')
-    opt.SAMBA3_ADD_OPTION('pthreadpool', with_name="enable", without_name="disable")
+    opt.SAMBA3_ADD_OPTION('pthreadpool', with_name="enable", without_name="disable", default=True)
     opt.SAMBA3_ADD_OPTION('avahi', with_name="enable", without_name="disable")
     opt.SAMBA3_ADD_OPTION('iconv')
     opt.SAMBA3_ADD_OPTION('acl-support')
@@ -46,9 +41,10 @@ def set_options(opt):
     opt.SAMBA3_ADD_OPTION('syslog')
     opt.SAMBA3_ADD_OPTION('automount')
     opt.SAMBA3_ADD_OPTION('aio-support')
+    opt.SAMBA3_ADD_OPTION('dmapi', default=False, help="build with DMAPI support")
     opt.SAMBA3_ADD_OPTION('profiling-data', default=False)
 
-    opt.SAMBA3_ADD_OPTION('cluster-support')
+    opt.SAMBA3_ADD_OPTION('cluster-support', default=None)
 
     opt.add_option('--with-ctdb-dir',
                    help=("Directory under which ctdb is installed"),
@@ -62,6 +58,9 @@ def set_options(opt):
 def configure(conf):
     from samba_utils import TO_LIST
 
+    default_static_modules = []
+    default_shared_modules = []
+
     if Options.options.developer:
         conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')
         conf.env.developer = True
@@ -69,24 +68,24 @@ def configure(conf):
     if Options.options.with_swat:
         conf.env['build_swat'] = True
 
-    conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
+    if sys.platform != 'openbsd5':
+        conf.ADD_LDFLAGS("-Wl,--export-dynamic", testflags=True)
 
     conf.CHECK_HEADERS('execinfo.h libexc.h libunwind.h netdb.h')
     conf.CHECK_HEADERS('linux/falloc.h')
 
-    conf.CHECK_FUNCS('getcwd fchown chmod fchmod mknod mknod64')
+    conf.CHECK_FUNCS('getcwd fchown chmod fchmod mknod')
     conf.CHECK_FUNCS('strtol strchr strupr chflags')
     conf.CHECK_FUNCS('getrlimit fsync fdatasync setpgid')
     conf.CHECK_FUNCS('setsid glob strpbrk crypt16 getauthuid')
     conf.CHECK_FUNCS('sigprocmask sigblock sigaction sigset innetgr')
     conf.CHECK_FUNCS('initgroups select poll rdchk getgrnam getgrent pathconf')
-    conf.CHECK_FUNCS('setpriv setgidx setuidx setgroups sysconf stat64 fstat64')
-    conf.CHECK_FUNCS('lstat64 fopen64 atexit grantpt lseek64 ftruncate64 fallocate fallocate64 posix_fallocate posix_fallocate64')
-    conf.CHECK_FUNCS('fseeko fseek64 fseeko64 ftell64 ftello64 setluid')
+    conf.CHECK_FUNCS('setpriv setgidx setuidx setgroups syscall sysconf')
+    conf.CHECK_FUNCS('atexit grantpt fallocate posix_fallocate')
+    conf.CHECK_FUNCS('fseeko setluid')
     conf.CHECK_FUNCS('getpwnam', headers='sys/types.h pwd.h')
-    conf.CHECK_FUNCS('opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64')
-    conf.CHECK_FUNCS('fdopendir fdopendir64')
-    conf.CHECK_FUNCS('getpwent_r getdents64 setenv strcasecmp fcvt fcvtl')
+    conf.CHECK_FUNCS('fdopendir')
+    conf.CHECK_FUNCS('getpwent_r setenv strcasecmp fcvt fcvtl')
     conf.CHECK_FUNCS('syslog vsyslog timegm setlocale')
     conf.CHECK_FUNCS_IN('nanosleep', 'rt')
     conf.CHECK_FUNCS('lutimes futimes utimensat futimens')
@@ -98,6 +97,7 @@ def configure(conf):
     #FIXME: for some reason this one still fails
     conf.CHECK_FUNCS_IN('yp_get_default_domain', 'nsl')
     conf.CHECK_FUNCS_IN('dn_expand _dn_expand __dn_expand', 'resolv')
+    conf.CHECK_FUNCS_IN('dn_expand', 'inet')
     conf.CHECK_DECLS('fdatasync', reverse=True)
     conf.CHECK_DECLS('readahead', reverse=True, headers='fcntl.h')
 
@@ -108,18 +108,16 @@ def configure(conf):
 #if defined(HAVE_UNISTD_H)
 #include <unistd.h>
 #endif
-long ret = splice(0,0,1,0,400,0);
+long ret = splice(0,0,1,0,400,SPLICE_F_MOVE);
 ''',
         'HAVE_LINUX_SPLICE',
         headers='fcntl.h'):
         conf.CHECK_DECLS('splice', reverse=True, headers='fcntl.h')
 
     # Check for inotify support
-    conf.CHECK_HEADERS('linux/inotify.h asm/unistd.h sys/inotify.h')
-    conf.CHECK_FUNCS('inotify_init')
-    if "HAVE_INOTIFY_INIT" in conf.env:
-        if "HAVE_LINUX_INOTIFY_H" in conf.env or "HAVE_SYS_INOTIFY_H" in conf.env:
-            conf.DEFINE('HAVE_INOTIFY', 1)
+    conf.CHECK_HEADERS('sys/inotify.h')
+    if "HAVE_SYS_INOTIFY_H" in conf.env:
+        conf.DEFINE('HAVE_INOTIFY', 1)
 
     # Check for kernel change notify support
     conf.CHECK_CODE('''
@@ -163,10 +161,72 @@ main() {
 main() {
         exit(flock(open("/dev/null", O_RDWR), LOCK_MAND|LOCK_READ) != 0);
 }''', 'HAVE_KERNEL_SHARE_MODES', addmain=False, execute=True,
-        msg="Checking for krenel share modes")
+        msg="Checking for kernel share modes")
+
+    # check for DMAPI libs
+    Logs.info("Checking for DMAPI library existence")
+    conf.env['dmapi_lib'] = ''
+    samba_dmapi_lib = ''
+    if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dm'):
+        samba_dmapi_lib = 'dm'
+    else:
+        if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'jfsdm'):
+            samba_dmapi_lib = 'jfsdm'
+        else:
+            if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'dmapi'):
+                samba_dmapi_lib = 'dmapi'
+            else:
+                if conf.CHECK_FUNCS_IN('dm_get_eventlist', 'xdsm'):
+                    samba_dmapi_lib = 'xdsm'
+    # only bother to test headers and compilation when a candidate
+    # library has been found
+    if Options.options.with_dmapi == True and samba_dmapi_lib == '':
+        conf.fatal('DMAPI support requested, but no suitable DMAPI library found')
+    else:
+        conf.CHECK_HEADERS('sys/dmi.h xfs/dmapi.h sys/jfsdmapi.h sys/dmapi.h dmapi.h')
+        conf.CHECK_CODE('''
+#include <time.h>      /* needed by Tru64 */
+#include <sys/types.h> /* needed by AIX */
+#ifdef HAVE_XFS_DMAPI_H
+#include <xfs/dmapi.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>
+#elif defined(HAVE_DMAPI_H)
+#include <dmapi.h>
+#endif
+
+/* This link test is designed to fail on IRI 6.4, but should
+ * succeed on Linux, IRIX 6.5 and AIX.
+ */
+int main(int argc, char **argv)
+{
+       char * version;
+       dm_eventset_t events;
+       /* This doesn't take an argument on IRIX 6.4. */
+       dm_init_service(&version);
+       /* IRIX 6.4 expects events to be a pointer. */
+       DMEV_ISSET(DM_EVENT_READ, events);
+
+       return 0;
+}
+''',
+        'USE_DMAPI',
+        addmain=False,
+        execute=False,
+        lib=samba_dmapi_lib,
+        msg='Checking whether DMAPI lib '+samba_dmapi_lib+' can be used')
+
+        if conf.CONFIG_SET('USE_DMAPI'):
+            conf.env['dmapi_lib'] = samba_dmapi_lib
+        else:
+            if Options.options.with_dmapi == True:
+                conf.fatal('DMAPI support requested but not found');
 
     # Check for various members of the stat structure
-    conf.CHECK_TYPES('blksize_t blkcnt_t')
     conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_blocks', define='HAVE_STAT_ST_BLOCKS',
                                 headers='sys/stat.h')
     conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_blksize', define='HAVE_STAT_ST_BLKSIZE',
@@ -174,6 +234,20 @@ main() {
     conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_flags', define='HAVE_STAT_ST_FLAGS',
                                 headers='sys/types.h sys/stat.h unistd.h')
 
+    if "HAVE_BLKCNT_T" in conf.env:
+       conf.CHECK_CODE('''
+       return sizeof(blkcnt_t) == 4 ? 0 : 1''',
+               'SIZEOF_BLKCNT_T_4', execute=True,
+               headers='replace.h sys/types.h sys/stat.h unistd.h',
+               msg="Checking whether blkcnt_t is 32 bit")
+
+    if "HAVE_BLKCNT_T" in conf.env:
+       conf.CHECK_CODE('''
+       return sizeof(blkcnt_t) == 8 ? 0 : 1''',
+               'SIZEOF_BLKCNT_T_8', execute=True,
+               headers='replace.h sys/types.h sys/stat.h unistd.h',
+               msg="Checking whether blkcnt_t is 64 bit")
+
     # Check for POSIX capability support
     conf.CHECK_FUNCS_IN('cap_get_proc', 'cap', headers='sys/capability.h')
 
@@ -225,42 +299,45 @@ if (0) {
                     msg="Checking for LL suffix on long long integers")
 
     conf.CHECK_FUNCS('''
-_acl __acl add_proplist_entry atexit attr_getf attr_list attr_listf
-attropen attr_remove attr_removef attr_set attr_setf backtrace_symbols
+_acl __acl atexit 
 bindtextdomain _chdir __chdir chflags chmod _close __close _closedir
-__closedir closedir64 creat64 crypt16 delproplist devnm dgettext dirfd
+__closedir crypt16 devnm dgettext dirfd
 DNSServiceRegister _dup __dup _dup2 __dup2 endmntent execl
-extattr_delete_fd extattr_delete_link extattr_get_fd extattr_get_file
-extattr_get_link extattr_list_fd extattr_list_file extattr_list_link
-extattr_set_fd extattr_set_file extattr_set_link _facl __facl _fchdir
+_facl __facl _fchdir
 __fchdir fchmod fchown _fcntl __fcntl fcvt fcvtl fdatasync
-fdelproplist fgetea fgetproplist fgetxattr flistea flistxattr fopen64
-_fork __fork fremoveea fremovexattr fseeko fseek64 fseeko64 fsetea
-fsetproplist fsetxattr _fstat __fstat fstat64 _fstat64 __fstat64 fsync
-ftell64 ftello64 ftruncate64 futimens futimes __fxstat getauthuid
-getcwd _getcwd __getcwd getdents __getdents getdents64 getdirentries
+_fork __fork fseeko
+fsetxattr _fstat __fstat fsync
+futimens futimes __fxstat getauthuid
+getcwd _getcwd __getcwd getdents __getdents getdirentries
 getgrent getgrnam getgrouplist getgrset getmntent getpagesize
-getproplist get_proplist_entry getpwanam getpwent_r getrlimit gettext
+getpwanam getpwent_r getrlimit gettext
 glob grantpt hstrerror initgroups innetgr
-inotify_init lgetea lgetxattr listea listxattr llistea llistxattr
-llseek _llseek __llseek lremoveea lremovexattr _lseek __lseek lseek64
-lsetea lsetxattr _lstat __lstat lstat64 _lstat64 __lstat64 lutimes
-__lxstat memalign mknod mknod64 mlock mlockall munlock munlockall
-_open __open open64 _open64 __open64 _opendir __opendir
-opendir64 pathconf poll posix_fallocate posix_fallocate64
-posix_memalign prctl pread _pread __pread pread64 _pread64 __pread64
-pwrite _pwrite __pwrite pwrite64 _pwrite64
-__pwrite64 rdchk _read __read _readdir __readdir readdir64 _readdir64
-__readdir64 removeea removexattr rewinddir64 _seekdir __seekdir
-seekdir64 select setea setenv setgidx setgroups setlocale setluid
-setmntent setpgid setpriv setproplist setsid setuidx
-setxattr shmget shm_open sigaction sigblock sigprocmask sigset
-sizeof_proplist_entry _stat __stat stat64 _stat64 __stat64 statvfs
+llseek _llseek __llseek _lseek __lseek
+_lstat __lstat lutimes
+__lxstat memalign mknod mlock mlockall munlock munlockall
+_open __open _opendir __opendir
+pathconf poll posix_fallocate
+posix_memalign prctl pread _pread __pread
+pwrite _pwrite __pwrite
+rdchk _read __read _readdir __readdir
+_seekdir __seekdir
+select setenv setgidx setgroups setlocale setluid
+setmntent setpgid setpriv setsid setuidx
+shmget shm_open sigaction sigblock sigprocmask sigset
+_stat __stat statvfs
 strcasecmp strchr strpbrk strsignal strtol strupr sysconf sysctl sysctlbyname
-__sys_llseek syslog _telldir __telldir telldir64 textdomain timegm
+__sys_llseek syslog _telldir __telldir textdomain timegm
 utimensat vsyslog _write __write __xstat
 ''')
 
+    conf.CHECK_CODE('''
+#ifdef HAVE_SYS_PRCTL_H
+#include <sys/prctl.h>
+#endif
+int i; i = prtcl(0); 
+''', 
+                    'HAVE_PRCTL', link=False)
+
     conf.CHECK_SAMBA3_CHARSET() # see build/charset.py
 
     # FIXME: these should be tests for features, but the old build system just
@@ -281,28 +358,57 @@ utimensat vsyslog _write __write __xstat
         conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
     elif (host_os.rfind('darwin') > -1):
         conf.DEFINE('DARWINOS', 1)
-        conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
         conf.ADD_CFLAGS('-fno-common')
+        conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
     elif (host_os.rfind('freebsd') > -1):
+        conf.DEFINE('FREEBSD', 1)
         if conf.CHECK_HEADERS('sunacl.h'):
             conf.DEFINE('HAVE_FREEBSD_SUNACL_H', '1')
             conf.CHECK_FUNCS_IN('acl', 'sunacl')
         conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
-    elif (host_os.rfind('netbsd') > -1):
-        conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
-    elif (host_os.rfind('openbsd') > -1):
+    elif (host_os.rfind('irix') > -1):
+        conf.DEFINE('IRIX', 1)
         conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
-    elif (host_os.rfind('sunos') > -1):
+    elif (host_os.rfind('aix') > -1):
+        conf.DEFINE('AIX', 1)
+        conf.DEFINE('STAT_ST_BLOCKSIZE', 'DEV_BSIZE')
+    elif (host_os.rfind('hpux') > -1):
+        conf.DEFINE('HPUX', 1)
+        conf.DEFINE('STAT_ST_BLOCKSIZE', '8192')
+    elif (host_os.rfind('osf') > -1):
+        conf.DEFINE('OSF1', 1)
         conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
+
     # FIXME: Add more checks here.
     else:
-        Logs.warn("Unknown host_os '%s', please report this to samba-technical@samba.org" % host_os)
+        conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
 
-    #FIXME: add more checks
     if Options.options.with_acl_support:
-        if host_os.rfind('linux') > -1:
+       if (host_os.rfind('sysv5') > -1) and conf.CHECK_FUNCS_IN('sec', 'facl', checklibc=True):
+               Logs.info('Using UnixWare ACLs')
+                conf.DEFINE('HAVE_UNIXWARE_ACLS',1)
+                default_static_modules.extend(TO_LIST('vfs_solarisacl'))
+       elif (host_os.rfind('solaris') > -1) and conf.CHECK_FUNCS_IN('sec', 'facl'):
+               Logs.info('Using solaris ACLs')
+                conf.DEFINE('HAVE_SOLARIS_ACLS',1)
+                default_static_modules.extend(TO_LIST('vfs_solarisacl'))
+       elif (host_os.rfind('hpux') > -1):
+               Logs.info('Using HPUX ACLs')
+                conf.DEFINE('HAVE_HPUX_ACLS',1)
+                conf.DEFINE('POSIX_ACL_NEEDS_MASK',1)
+                default_static_modules.extend(TO_LIST('vfs_hpuxacl'))
+       elif (host_os.rfind('aix') > -1):
+               Logs.info('Using AIX ACLs')
+                conf.DEFINE('HAVE_AIX_ACLS',1)
+                default_static_modules.extend(TO_LIST('vfs_aixacl'))
+       elif (host_os.rfind('osf') > -1) and conf.CHECK_FUNCS_IN('pacl', 'acl_get_fd'):
+               Logs.info('Using Tru64 ACLs')
+                conf.DEFINE('HAVE_TRU64_ACLS',1)
+                default_static_modules.extend(TO_LIST('vfs_tru64acl'))
+        elif (host_os.rfind('darwin') > -1):
+            Logs.warn('ACLs on Dwarwin currently not supported')
+        else:
             conf.CHECK_FUNCS_IN('acl_get_file', 'acl')
-            conf.CHECK_FUNCS_IN('getxattr', 'attr')
             if conf.CHECK_CODE('''
 acl_t acl;
 int entry_id;
@@ -320,12 +426,8 @@ return acl_get_perm_np(permset_d, perm);
                         'HAVE_ACL_GET_PERM_NP',
                         headers='sys/types.h sys/acl.h', link=True,
                         msg="Checking whether acl_get_perm_np() is available")
-        else:
-            conf.DEFINE('HAVE_NO_ACLS', 1)
-            conf.SET_TARGET_TYPE('acl', 'EMPTY')
-    else:
-        conf.DEFINE('HAVE_NO_ACLS', 1)
-        conf.SET_TARGET_TYPE('acl', 'EMPTY')
+                default_static_modules.extend(TO_LIST('vfs_posixacl'))
+
 
     if conf.CHECK_FUNCS('dirfd'):
         conf.DEFINE('HAVE_DIRFD_DECL', 1)
@@ -342,12 +444,6 @@ return acl_get_perm_np(permset_d, perm);
                 'HAVE_LINUX_FALLOCATE',
                 msg="Checking whether the Linux 'fallocate' function is available",
                 headers='unistd.h sys/types.h fcntl.h linux/falloc.h')
-    if conf.CONFIG_SET('HAVE_FALLOCATE64'):
-        conf.CHECK_CODE('''
-                int ret = fallocate64(0, FALLOC_FL_KEEP_SIZE, 0, 10);''',
-                'HAVE_LINUX_FALLOCATE64',
-                msg="Checking whether the Linux 'fallocate64' function is available",
-                headers='unistd.h sys/types.h fcntl.h linux/falloc.h')
     conf.CHECK_CODE('''
                 ssize_t err = readahead(0,0,0x80000);''',
                 'HAVE_LINUX_READAHEAD',
@@ -355,23 +451,10 @@ return acl_get_perm_np(permset_d, perm);
                 headers='unistd.h fcntl.h')
     conf.CHECK_DECLS('readahead', headers='fcntl.h', always=True)
 
-    conf.CHECK_CODE('''
-                struct ucred cred;
-                socklen_t cred_len;
-                int ret = getsockopt(0, SOL_SOCKET, SO_PEERCRED, &cred, &cred_len);''',
-                'HAVE_PEERCRED',
-                msg="Checking whether we can use SO_PEERCRED to get socket credentials",
-                headers='sys/types.h sys/socket.h')
-
-    conf.CHECK_CODE('''
-                #if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
-                #include <sys/types.h>
-                #else
-                __COMPILE_ERROR_
-                #endif
-                int i;''',
-                'HAVE_EXPLICIT_LARGEFILE_SUPPORT',
-                msg="Checking whether large file support can be enabled")
+    conf.CHECK_CODE('int fd = openat(AT_FDCWD, ".", O_RDONLY);',
+               'HAVE_OPENAT',
+               msg='Checking for openat',
+               headers='fcntl.h')
 
     if Options.options.with_aio_support:
         conf.CHECK_FUNCS_IN('aio_read', 'aio')
@@ -381,16 +464,6 @@ return acl_get_perm_np(permset_d, perm);
                         msg='Checking for asynchronous io support',
                         headers='sys/types.h aio.h',
                         lib='aio rt')
-        conf.CHECK_CODE('struct aiocb64 a; return aio_read64(&a);',
-                        'HAVE_AIO64',
-                        msg='Checking for 64-bit asynchronous io support',
-                        headers='sys/types.h aio.h',
-                        lib='aio rt')
-        if conf.CONFIG_SET('HAVE_AIO64'):
-            conf.DEFINE('HAVE_AIOCB64', '1')
-            conf.DEFINE('WITH_AIO', '1')
-        elif conf.CONFIG_SET('HAVE_AIO'):
-            conf.DEFINE('WITH_AIO', '1')
         if conf.CONFIG_SET('HAVE_AIO'):
             conf.CHECK_CODE('struct aiocb a; return aio_read(&a);', 'HAVE_AIO_READ', msg='Checking for aio_read', headers='aio.h', lib='aio rt')
             conf.CHECK_CODE('struct aiocb a; return aio_write(&a);', 'HAVE_AIO_WRITE', msg='Checking for aio_write', headers='aio.h', lib='aio rt')
@@ -399,19 +472,34 @@ return acl_get_perm_np(permset_d, perm);
             conf.CHECK_CODE('struct aiocb a; return aio_error(&a);', 'HAVE_AIO_ERROR', msg='Checking for aio_error', headers='aio.h', lib='aio rt')
             conf.CHECK_CODE('struct aiocb a; return aio_cancel(1, &a);', 'HAVE_AIO_CANCEL', msg='Checking for aio_cancel', headers='aio.h', lib='aio rt')
             conf.CHECK_CODE('struct aiocb a; return aio_suspend(&a, 1, NULL);', 'HAVE_AIO_SUSPEND', msg='Checking for aio_suspend', headers='aio.h', lib='aio rt')
-        if conf.CONFIG_SET('HAVE_AIO64'):
-            conf.CHECK_CODE('struct aiocb a; return aio_read64(&a);', 'HAVE_AIO_READ64', msg='Checking for aio_read64', headers='aio.h', lib='aio rt')
-            conf.CHECK_CODE('struct aiocb a; return aio_write64(&a);', 'HAVE_AIO_WRITE64', msg='Checking for aio_write64', headers='aio.h', lib='aio rt')
-            conf.CHECK_CODE('struct aiocb a; return aio_fsync64(1, &a);', 'HAVE_AIO_FSYNC64', msg='Checking for aio_fsync64', headers='aio.h', lib='aio rt')
-            conf.CHECK_CODE('struct aiocb a; return aio_return64(&a);', 'HAVE_AIO_RETURN64', msg='Checking for aio_return64', headers='aio.h', lib='aio rt')
-            conf.CHECK_CODE('struct aiocb a; return aio_error64(&a);', 'HAVE_AIO_ERROR64', msg='Checking for aio_error64', headers='aio.h', lib='aio rt')
-            conf.CHECK_CODE('struct aiocb a; return aio_cancel64(1, &a);', 'HAVE_AIO_CANCEL64', msg='Checking for aio_cancel64', headers='aio.h', lib='aio rt')
-            conf.CHECK_CODE('struct aiocb a; return aio_suspend64(&a, 1, NULL);', 'HAVE_AIO_SUSPEND64', msg='Checking for aio_suspend64', headers='aio.h', lib='aio rt')
         if not conf.CONFIG_SET('HAVE_AIO'):
             conf.DEFINE('HAVE_NO_AIO', '1')
     else:
         conf.DEFINE('HAVE_NO_AIO', '1')
 
+    if host_os.rfind('linux') > -1:
+       conf.CHECK_FUNCS_IN('io_submit', 'aio')
+       conf.CHECK_CODE('''
+struct io_event ioev;
+struct iocb *ioc;
+io_context_t ctx;
+struct timespec ts;
+int fd;
+char *buf;
+fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
+io_queue_init(128,&ctx);
+io_prep_pwrite(ioc, 1, buf, 1, 0);
+io_prep_pread(ioc, 1, buf, 1, 0);
+io_set_eventfd(ioc, fd);
+io_set_callback(ioc, (io_callback_t)(0));
+io_submit(ctx, 1, &ioc);
+io_getevents(ctx, 1, 1, &ioev, &ts);
+''',
+                       'HAVE_LINUX_KERNEL_AIO',
+                       msg='Checking for linux kernel asynchronous io support',
+                       headers='unistd.h stdlib.h sys/types.h fcntl.h sys/eventfd.h libaio.h',
+                       lib='aio')
+
     conf.CHECK_CODE('''
 struct msghdr msg;
 union {
@@ -441,12 +529,6 @@ msg.msg_acctrightslen = sizeof(fd);
     conf.find_program('awk', var='AWK')
     conf.find_program('perl', var='PERL')
 
-    # Darwin has extra options to xattr-family functions
-    conf.CHECK_CODE('getxattr(0, 0, 0, 0, 0, 0);',
-                    'XATTR_ADD_OPT',
-                    msg="Checking whether xattr interface takes additional options",
-                    headers='sys/types.h attr/xattr.h sys/xattr.h')
-
     conf.CHECK_HEADERS('asm/types.h')
 
     conf.CHECK_CODE('dev_t dev; int i = major(dev); return 0', "HAVE_DEVICE_MAJOR_FN",
@@ -535,7 +617,7 @@ msg.msg_acctrightslen = sizeof(fd);
             conf.DEFINE('LDAP_SET_REBIND_PROC_ARGS', '2')
 
         # last but not least, if ldap_init() exists, we want to use ldap
-        if conf.CONFIG_SET('HAVE_LDAP_INIT'):
+        if conf.CONFIG_SET('HAVE_LDAP_INIT') and conf.CONFIG_SET('HAVE_LDAP_H'):
             conf.DEFINE('HAVE_LDAP', '1')
             conf.DEFINE('LDAP_DEPRECATED', '1')
             conf.env['HAVE_LDAP'] = '1'
@@ -548,266 +630,61 @@ msg.msg_acctrightslen = sizeof(fd);
         conf.SET_TARGET_TYPE('ldap', 'EMPTY')
         conf.SET_TARGET_TYPE('lber', 'EMPTY')
 
-    # Check for kerberos
-    have_gssapi=False
-    if Options.options.with_mit_krb5_checks and conf.env.developer:
-        Logs.info("Looking for kerberos features")
-        conf.find_program('krb5-config', var='KRB5_CONFIG')
-        if conf.env.KRB5_CONFIG:
-            conf.check_cfg(path="krb5-config", args="--cflags --libs",
-                       package="gssapi", uselib_store="KRB5")
-        conf.CHECK_HEADERS('krb5.h krb5/locate_plugin.h', lib='krb5')
-        conf.CHECK_HEADERS('gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h gssapi/gssapi_ext.h gssapi/gssapi_krb5.h com_err.h', lib='krb5')
-
-        if conf.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
-            conf.env['WINBIND_KRB5_LOCATOR'] = 'bin/winbind_krb5_locator.so'
-
-        conf.CHECK_FUNCS_IN('_et_list', 'com_err')
-        conf.CHECK_FUNCS_IN('krb5_encrypt_data', 'k5crypto')
-        conf.CHECK_FUNCS_IN('des_set_key','crypto')
-        conf.CHECK_FUNCS_IN('copy_Authenticator', 'asn1')
-        conf.CHECK_FUNCS_IN('roken_getaddrinfo_hostspec', 'roken')
-        if conf.CHECK_FUNCS_IN('gss_display_status', 'gssapi') or \
-           conf.CHECK_FUNCS_IN('gss_display_status', 'gssapi_krb5'):
-            have_gssapi=True
-        conf.CHECK_FUNCS_IN('''
-               gss_wrap_iov
-               gss_krb5_import_cred
-               gss_get_name_attribute
-               gss_mech_krb5
-               gss_oid_equal
-               gss_inquire_sec_context_by_oid
-               gsskrb5_extract_authz_data_from_sec_context
-               gss_krb5_export_lucid_sec_context
-               ''', 'gssapi gssapi_krb5 krb5')
-        conf.CHECK_FUNCS_IN('krb5_mk_req_extended krb5_kt_compare', 'krb5')
-        conf.CHECK_FUNCS('''
-krb5_set_default_in_tkt_etypes krb5_set_default_tgs_enctypes
-krb5_set_default_tgs_ktypes krb5_principal2salt krb5_use_enctype
-krb5_string_to_key krb5_get_pw_salt krb5_string_to_key_salt krb5_auth_con_setkey
-krb5_auth_con_setuseruserkey krb5_locate_kdc krb5_get_permitted_enctypes
-krb5_get_default_in_tkt_etypes krb5_free_data_contents
-krb5_principal_get_comp_string krb5_free_unparsed_name
-krb5_free_keytab_entry_contents krb5_kt_free_entry krb5_krbhst_init
-krb5_krbhst_get_addrinfo krb5_c_enctype_compare
-krb5_crypto_init krb5_crypto_destroy krb5_decode_ap_req free_AP_REQ
-krb5_c_verify_checksum krb5_principal_compare_any_realm
-krb5_parse_name_norealm krb5_princ_size krb5_get_init_creds_opt_set_pac_request
-krb5_get_renewed_creds krb5_free_error_contents
-initialize_krb5_error_table krb5_get_init_creds_opt_alloc
-krb5_get_init_creds_opt_free krb5_get_init_creds_opt_get_error
-krb5_enctype_to_string krb5_fwd_tgt_creds krb5_auth_con_set_req_cksumtype
-krb5_get_creds_opt_alloc krb5_get_creds_opt_set_impersonate krb5_get_creds
-krb5_get_credentials_for_user krb5_get_host_realm krb5_free_host_realm''',
-                         lib='krb5 k5crypto')
-        conf.CHECK_DECLS('''krb5_get_credentials_for_user
-                            krb5_auth_con_set_req_cksumtype''',
-                            headers='krb5.h', always=True)
-        conf.CHECK_VARIABLE('AP_OPTS_USE_SUBKEY', headers='krb5.h')
-        conf.CHECK_VARIABLE('KV5M_KEYTAB', headers='krb5.h')
-        conf.CHECK_VARIABLE('KRB5_KU_OTHER_CKSUM', headers='krb5.h')
-        conf.CHECK_VARIABLE('KRB5_KEYUSAGE_APP_DATA_CKSUM', headers='krb5.h')
-        conf.CHECK_VARIABLE('ENCTYPE_AES128_CTS_HMAC_SHA1_96', headers='krb5.h')
-        conf.CHECK_VARIABLE('ENCTYPE_AES256_CTS_HMAC_SHA1_96', headers='krb5.h')
-        conf.CHECK_DECLS('KRB5_PDU_NONE', reverse=True, headers='krb5.h')
-        conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'key', headers='krb5.h',
-                                    define='HAVE_KRB5_KEYTAB_ENTRY_KEY')
-        conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'keyblock', headers='krb5.h',
-                                    define='HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK')
-        conf.CHECK_STRUCTURE_MEMBER('krb5_address', 'magic', headers='krb5.h',
-                                    define='HAVE_MAGIC_IN_KRB5_ADDRESS')
-        conf.CHECK_STRUCTURE_MEMBER('krb5_address', 'addrtype', headers='krb5.h',
-                                    define='HAVE_ADDRTYPE_IN_KRB5_ADDRESS')
-        conf.CHECK_STRUCTURE_MEMBER('krb5_ticket', 'enc_part2', headers='krb5.h',
-                                    define='HAVE_KRB5_TKT_ENC_PART2')
-        conf.CHECK_STRUCTURE_MEMBER('krb5_creds', 'keyblock', headers='krb5.h',
-                                    define='HAVE_KRB5_KEYBLOCK_IN_CREDS')
-        conf.CHECK_STRUCTURE_MEMBER('krb5_creds', 'session', headers='krb5.h',
-                                    define='HAVE_KRB5_SESSION_IN_CREDS')
-        conf.CHECK_STRUCTURE_MEMBER('krb5_ap_req', 'ticket', headers='krb5.h',
-                                    define='HAVE_TICKET_POINTER_IN_KRB5_AP_REQ')
-
-        conf.CHECK_TYPE('krb5_encrypt_block', headers='krb5.h')
-
-        conf.CHECK_CODE('''
-krb5_ticket ticket;
-krb5_kvno kvno;
-krb5_enctype enctype;
-enctype = ticket.enc_part.enctype;
-kvno = ticket.enc_part.kvno;
-''',
-                        'KRB5_TICKET_HAS_KEYINFO',
-                        headers='krb5.h', link=False,
-                        msg="Checking whether the krb5_ticket structure contains the kvno and enctype")
-        conf.CHECK_CODE('''
-krb5_context ctx;
-krb5_get_init_creds_opt *opt = NULL;
-krb5_get_init_creds_opt_free(ctx, opt);
-''',
-                        'KRB5_CREDS_OPT_FREE_REQUIRES_CONTEXT',
-                        headers='krb5.h', link=False,
-                        msg="Checking whether krb5_get_init_creds_opt_free takes a context argument")
-        conf.CHECK_CODE('krb5_mk_error(0,0,0)',
-                        'HAVE_SHORT_KRB5_MK_ERROR_INTERFACE',
-                        headers='krb5.h', link=False,
-                        msg="Checking whether krb5_mk_error takes 3 arguments MIT or 9 Heimdal")
-        conf.CHECK_CODE('''
-const krb5_data *pkdata;
-krb5_context context;
-krb5_principal principal;
-pkdata = krb5_princ_component(context, principal, 0);
-''',
-                        'HAVE_KRB5_PRINC_COMPONENT',
-                        headers='krb5.h', lib='krb5',
-                        msg="Checking whether krb5_princ_component is available")
-
-        conf.CHECK_CODE('''
-int main(void) {
-char buf[256];
-krb5_enctype_to_string(1, buf, 256);
-return 0;
-}''',
-                        'HAVE_KRB5_ENCTYPE_TO_STRING_WITH_SIZE_T_ARG',
-                        headers='krb5.h', lib='krb5 k5crypto',
-                        addmain=False, cflags='-Werror',
-                        msg="Checking whether krb5_enctype_to_string takes size_t argument")
-
-        conf.CHECK_CODE('''
-int main(void) {
-krb5_context context = NULL;
-char *str = NULL;
-krb5_enctype_to_string(context, 1, &str);
-if (str) free (str);
-return 0;
-}''',
-                        'HAVE_KRB5_ENCTYPE_TO_STRING_WITH_KRB5_CONTEXT_ARG',
-                        headers='krb5.h stdlib.h', lib='krb5',
-                        addmain=False, cflags='-Werror',
-                        msg="Checking whether krb5_enctype_to_string takes krb5_context argument")
-        conf.CHECK_CODE('''
-int main(void) {
-krb5_context ctx = NULL;
-krb5_principal princ = NULL;
-const char *str = krb5_princ_realm(ctx, princ)->data;
-return 0;
-}''',
-                        'HAVE_KRB5_PRINC_REALM',
-                        headers='krb5.h', lib='krb5',
-                        addmain=False,
-                        msg="Checking whether the macro krb5_princ_realm is defined")
-        conf.CHECK_CODE('''
-int main(void) {
-    krb5_context context;
-    krb5_principal principal;
-    const char *realm; realm = krb5_principal_get_realm(context, principal);
-    return 0;
-}''',
-                        'HAVE_KRB5_PRINCIPAL_GET_REALM',
-                        headers='krb5.h', lib='krb5',
-                        addmain=False,
-                        msg="Checking whether krb5_principal_get_realm is defined")
-        conf.CHECK_CODE('''
-krb5_enctype enctype;
-enctype = ENCTYPE_ARCFOUR_HMAC_MD5;
-''',
-            '_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5',
-            headers='krb5.h', lib='krb5',
-            msg="Checking whether the ENCTYPE_ARCFOUR_HMAC_MD5 key type definition is available");
-        conf.CHECK_CODE('''
-krb5_keytype keytype;
-keytype = KEYTYPE_ARCFOUR_56;
-''',
-            '_HAVE_KEYTYPE_ARCFOUR_56',
-            headers='krb5.h', lib='krb5',
-            msg="Checking whether the HAVE_KEYTYPE_ARCFOUR_56 key type definition is available");
-        if conf.CONFIG_SET('_HAVE_ENCTYPE_ARCFOUR_HMAC_MD5') and conf.CONFIG_SET('_HAVE_KEYTYPE_ARCFOUR_56'):
-            conf.DEFINE('HAVE_ENCTYPE_ARCFOUR_HMAC_MD5', '1')
-
-        conf.CHECK_CODE('''
-krb5_enctype enctype;
-enctype = ENCTYPE_ARCFOUR_HMAC;
-''',
-            'HAVE_ENCTYPE_ARCFOUR_HMAC',
-            headers='krb5.h', lib='krb5',
-            msg="Checking whether the ENCTYPE_ARCFOUR_HMAC key type definition is available");
-
-        conf.CHECK_CODE('''
-krb5_context context;
-krb5_keytab keytab;
-krb5_init_context(&context);
-return krb5_kt_resolve(context, "WRFILE:api", &keytab);
-''',
-            'HAVE_WRFILE_KEYTAB',
-            headers='krb5.h', lib='krb5', execute=True,
-            msg="Checking whether the WRFILE:-keytab is supported");
-
-        # Check for KRB5_DEPRECATED handling
-        conf.CHECK_CODE('''#define KRB5_DEPRECATED 1
-#include <krb5.h>''',
-        'HAVE_KRB5_DEPRECATED_WITH_IDENTIFIER', addmain=False,
-        link=False,
-        msg="Checking for KRB5_DEPRECATED define taking an identifier")
-
-    if Options.options.with_ads:
-        use_ads=True
+    if Options.options.with_ads == False:
+        use_ads = False
+        use_ads_krb5 = False
+        use_ads_ldap = False
+    else:
+        use_ads = True
+        use_ads_krb5 = True
+        use_ads_ldap = True
         if not conf.CONFIG_SET('HAVE_ENCTYPE_ARCFOUR_HMAC_MD5') and \
            not conf.CONFIG_SET('HAVE_ENCTYPE_ARCFOUR_HMAC'):
             Logs.warn("arcfour-hmac-md5 encryption type not found in -lkrb5")
-            use_ads=False
+            use_ads_krb5 = False
         if not conf.CONFIG_SET('HAVE_KRB5_MK_REQ_EXTENDED'):
             Logs.warn("krb5_mk_req_extended not found in -lkrb5")
-            use_ads=False
-        if not conf.CONFIG_SET('HAVE_KRB5_C_ENCTYPE_COMPARE'):
-            Logs.warn("krb5_c_enctype_compare not found in -lkrb5")
-            use_ads=False
+            use_ads_krb5 = False
         if not conf.CONFIG_SET('HAVE_KRB5_GET_HOST_REALM'):
             Logs.warn("krb5_get_host_realm not found in -lkrb5")
-            use_ads=False
+            use_ads_krb5 = False
         if not conf.CONFIG_SET('HAVE_KRB5_FREE_HOST_REALM'):
             Logs.warn("krb5_free_host_realm not found in -lkrb5")
-            use_ads=False
+            use_ads_krb5 = False
         if not conf.CONFIG_SET('HAVE_KRB5_FWD_TGT_CREDS'):
             Logs.warn("krb5_fwd_tgt_creds found in -lkrb5")
-            use_ads=False
+            use_ads_krb5 = False
         if not conf.CONFIG_SET('HAVE_KRB5_GET_INIT_CREDS_OPT_ALLOC'):
             Logs.warn("krb5_get_init_creds_opt_alloc not found in -lkrb5")
-            use_ads=False
+            use_ads_krb5 = False
         if not conf.CONFIG_SET('KRB5_CREDS_OPT_FREE_REQUIRES_CONTEXT'):
             Logs.warn("krb5_get_init_creds_opt_free was not found or was too old in -lkrb5")
-            use_ads=False
+            use_ads_krb5 = False
         if not conf.CONFIG_SET('HAVE_KRB5_GET_RENEWED_CREDS'):
             Logs.warn("krb5_get_renewed_creds not found in -lkrb5")
-            use_ads=False
+            use_ads_krb5 = False
         if not conf.CONFIG_SET('HAVE_KRB5_PRINCIPAL_COMPARE_ANY_REALM'):
             Logs.warn("krb5_principal_compare_any_realm not found in -lkrb5")
-            use_ads=False
-        if not conf.CONFIG_SET('HAVE_KRB5_STRING_TO_KEY'):
-            Logs.warn("krb5_string_to_key not found in -lkrb5")
-            use_ads=False
+            use_ads_krb5 = False
+        if not conf.CONFIG_SET('HAVE_KRB5_C_STRING_TO_KEY') and \
+           not conf.CONFIG_SET('HAVE_KRB5_STRING_TO_KEY_SALT'):
+            Logs.warn("krb5_c_string_to_key not found in -lkrb5")
+            use_ads_krb5 = False
         if not conf.CONFIG_SET('HAVE_KRB5_PRINCIPAL2SALT') and \
            not conf.CONFIG_SET('HAVE_KRB5_GET_PW_SALT'):
             Logs.warn("no CREATE_KEY_FUNCTIONS detected")
-            use_ads=False
+            use_ads_krb5 = False
         if not conf.CONFIG_SET('HAVE_KRB5_GET_PERMITTED_ENCTYPES') and \
            not conf.CONFIG_SET('HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES'):
             Logs.warn("no GET_ENCTYPES_FUNCTIONS detected")
-            use_ads=False
+            use_ads_krb5 = False
         if not conf.CONFIG_SET('HAVE_KRB5_KT_FREE_ENTRY') and \
            not conf.CONFIG_SET('HAVE_KRB5_FREE_KEYTAB_ENTRY_CONTENTS'):
             Logs.warn("no KT_FREE_FUNCTION detected")
-            use_ads=False
+            use_ads_krb5 = False
         if not conf.CONFIG_SET('HAVE_KRB5_C_VERIFY_CHECKSUM'):
             Logs.warn("krb5_c_verify_checksum_compare not found in -lkrb5")
-            use_ads=False
-        if not conf.CONFIG_SET('KRB5_TICKET_HAS_KEYINFO'):
-            # We only need the following functions if we can't get the enctype
-            # and kvno out of the ticket directly (ie. on Heimdal).
-            if not conf.CONFIG_SET('HAVE_FREE_AP_REQ'):
-                Logs.warn("no KRB5_AP_REQ_FREE_FUNCTION detected")
-                use_ads=False
-            if not conf.CONFIG_SET('HAVE_KRB5_DECODE_AP_REQ'):
-                Logs.warn("no KRB5_AP_REQ_DECODING_FUNCTION detected")
-                use_ads=False
+            use_ads_krb5 = False
 
         # We don't actually use
         # gsskrb5_extract_authz_data_from_sec_context, but it is a
@@ -817,27 +694,47 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab);
             not (conf.CONFIG_SET('HAVE_GSSKRB5_EXTRACT_AUTHZ_DATA_FROM_SEC_CONTEXT') and \
                      conf.CONFIG_SET('HAVE_GSS_INQUIRE_SEC_CONTEXT_BY_OID')):
             Logs.warn("need eiterh gss_get_name_attribute or gsskrb5_extract_authz_data_from_sec_context and gss_inquire_sec_context_by_oid in -lgssapi for PAC support")
-            use_ads=False
+            use_ads_krb5 = False
 
         if not conf.CONFIG_SET('HAVE_GSS_KRB5_EXPORT_LUCID_SEC_CONTEXT'):
             Logs.warn("need gss_krb5_export_lucid_sec_context for SPNEGO and gss_wrap support")
-            use_ads=False
+            use_ads_krb5 = False
 
-        if use_ads:
-            conf.DEFINE('WITH_ADS', '1')
+        if use_ads_krb5:
             conf.DEFINE('HAVE_KRB5', '1')
-            if have_gssapi:
-                conf.DEFINE('HAVE_GSSAPI', '1')
-            if conf.CONFIG_SET('HAVE_LDAP'):
-                conf.env['HAVE_ADS'] = '1'
+            conf.env['HAVE_KRB5'] = '1'
         else:
-            Logs.warn("krb5 libs don't have all features required for Active Directory support")
             conf.undefine('HAVE_KRB5_H')
             conf.undefine('HAVE_GSSAPI_H')
             conf.undefine('HAVE_GSSAPI_GSSAPI_GENERIC_H')
             conf.undefine('HAVE_GSSAPI_GSSAPI_H')
+            use_ads = False
+
+        if not conf.CONFIG_SET('HAVE_LDAP'):
+            use_ads = False
+            use_ads_ldap = False
+
+    if use_ads:
+        conf.DEFINE('WITH_ADS', '1')
+        conf.env['HAVE_ADS'] = '1'
+        Logs.info("Building with Active Directory support.")
+    elif Options.options.with_ads == False:
+        Logs.info("Building without Active Directory support (--without-ads).")
+    else:
+        if not use_ads_krb5:
+            Logs.warn("Active Directory support not available: krb5 libs don't have all required features")
+        if not use_ads_ldap:
+            Logs.warn("Active Directory support not available: LDAP support ist not available.")
+        if Options.options.with_ads:
+            conf.fatal("Active Directory support not found. Use --without-ads for building without Active Directory support.")
+        else:
+            # this is the auto-mode case
+            Logs.warn("Building without Active Directory support.")
+
 
     if Options.options.with_utmp:
+        conf.env.with_utmp = True
+        if not conf.CHECK_HEADERS('utmp.h'): conf.env.with_utmp = False
         conf.CHECK_FUNCS('pututline pututxline updwtmp updwtmpx getutmpx getutxent')
         conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_name', headers='utmp.h',
                                     define='HAVE_UT_UT_NAME')
@@ -857,16 +754,21 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab);
                                     define='HAVE_UT_UT_PID')
         conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_exit.e_exit', headers='utmp.h',
                                     define='HAVE_UT_UT_EXIT')
-        conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_addr_v6', headers='utmp.h',
-                                    define='HAVE_UT_UT_ADDR_V6')
-        conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_addr', headers='utmp.h',
-                                    define='HAVE_UT_UT_ADDR')
         conf.CHECK_STRUCTURE_MEMBER('struct utmpx', 'ut_syslen', headers='utmpx.h',
                                     define='HAVE_UX_UT_SYSLEN')
         conf.CHECK_CODE('struct utmp utarg; struct utmp *utreturn; utreturn = pututline(&utarg);',
                         'PUTUTLINE_RETURNS_UTMP', headers='utmp.h',
                         msg="Checking whether pututline returns pointer")
-        conf.DEFINE('WITH_UTMP', 1)
+        conf.CHECK_SIZEOF(['((struct utmp *)NULL)->ut_line'], headers='utmp.h',
+                          define='SIZEOF_UTMP_UT_LINE')
+        if not conf.CONFIG_SET('SIZEOF_UTMP_UT_LINE'):
+            conf.env.with_utmp = False
+        elif int(conf.env.SIZEOF_UTMP_UT_LINE) < 15:
+            conf.env.with_utmp = False
+        if conf.env.with_utmp:
+            conf.DEFINE('WITH_UTMP', 1)
+        else:
+            Logs.warn("--with-utmp but utmp support not sufficient")
 
     if Options.options.with_avahi:
         conf.env.with_avahi = True
@@ -959,11 +861,78 @@ int i; i = PAM_RADIO_TYPE;
             conf.DEFINE('WITH_PAM', 1)
             conf.DEFINE('WITH_PAM_MODULES', 1)
 
+    if Options.options.with_pam_smbpass:
+        conf.env.with_pam_smbpass = True
+
     seteuid = False
+
+#
+# Ensure we select the correct set of system calls on Linux.
+#
+    if (host_os.rfind('linux') > -1):
+        conf.CHECK_CODE('''
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <errno.h>
+
+#ifdef HAVE_SYS_PRIV_H
+#include <sys/priv.h>
+#endif
+#ifdef HAVE_SYS_ID_H
+#include <sys/id.h>
+#endif
+
+#if defined(HAVE_SYSCALL_H)
+#include <syscall.h>
+#endif
+
+#if defined(HAVE_SYS_SYSCALL_H)
+#include <sys/syscall.h>
+#endif
+
+syscall(SYS_setresuid32, -1, -1, -1);
+syscall(SYS_setresgid32, -1, -1, -1);
+syscall(SYS_setreuid32, -1, -1);
+syscall(SYS_setregid32, -1, -1);
+syscall(SYS_setuid32, -1);
+syscall(SYS_setgid32, -1);
+syscall(SYS_setgroups32, 0, NULL);
+''',
+            'USE_LINUX_32BIT_SYSCALLS',
+            msg="Checking whether Linux should use 32-bit credential calls");
+
+        if (conf.CONFIG_SET('USE_LINUX_32BIT_SYSCALLS')):
+            seteuid = conf.CHECK_CODE('''
+                                #define AUTOCONF_TEST 1
+                                #define USE_LINUX_THREAD_CREDENTIALS 1
+                                #define USE_LINUX_32BIT_SYSCALLS 1
+                                #include "../lib/util/setid.c"
+                                #include "./lib/util_sec.c"
+                                ''',
+                                'USE_LINUX_THREAD_CREDENTIALS',
+                                addmain=False,
+                                execute=True,
+                                msg="Checking whether we can use Linux thread-specific credentials with 32-bit system calls")
+        else:
+            seteuid = conf.CHECK_CODE('''
+                                #define AUTOCONF_TEST 1
+                                #define USE_LINUX_THREAD_CREDENTIALS 1
+                                #include "../lib/util/setid.c"
+                                #include "./lib/util_sec.c"
+                                ''',
+                                'USE_LINUX_THREAD_CREDENTIALS',
+                                addmain=False,
+                                execute=True,
+                                msg="Checking whether we can use Linux thread-specific credentials")
     if not seteuid:
         seteuid = conf.CHECK_CODE('''
                                 #define AUTOCONF_TEST 1
                                 #define USE_SETREUID 1
+                                #include "../lib/util/setid.c"
                                 #include "./lib/util_sec.c"
                                 ''',
                                 'USE_SETREUID',
@@ -974,6 +943,7 @@ int i; i = PAM_RADIO_TYPE;
         seteuid = conf.CHECK_CODE('''
                                 #define AUTOCONF_TEST 1
                                 #define USE_SETRESUID 1
+                                #include "../lib/util/setid.c"
                                 #include "./lib/util_sec.c"
                                 ''',
                                 'USE_SETRESUID',
@@ -984,6 +954,7 @@ int i; i = PAM_RADIO_TYPE;
         seteuid = conf.CHECK_CODE('''
                                 #define AUTOCONF_TEST 1
                                 #define USE_SETEUID 1
+                                #include "../lib/util/setid.c"
                                 #include "./lib/util_sec.c"
                                 ''',
                                 'USE_SETEUID',
@@ -994,6 +965,7 @@ int i; i = PAM_RADIO_TYPE;
         seteuid = conf.CHECK_CODE('''
                                 #define AUTOCONF_TEST 1
                                 #define USE_SETUIDX 1
+                                #include "../lib/util/setid.c"
                                 #include "./lib/util_sec.c"
                                 ''',
                                 'USE_SETUIDX',
@@ -1002,16 +974,10 @@ int i; i = PAM_RADIO_TYPE;
                                 mandatory=True,
                                 msg="Checking whether setuidx is available")
     if Options.options.with_dnsupdate:
-        conf.CHECK_HEADERS('uuid/uuid.h')
-        conf.CHECK_FUNCS_IN('uuid_generate', 'uuid')
-        if not conf.CONFIG_SET('HAVE_UUID_UUID_H') and not conf.CONFIG_SET('HAVE_UUID_GENERATE'):
-            Logs.warn("--with-dnsupdate=yes but uuid support not sufficient")
-        elif not conf.CONFIG_SET('HAVE_GSSAPI'):
+        if not conf.CONFIG_SET('HAVE_KRB5'):
             Logs.warn("--with-dnsupdate=yes but gssapi support not sufficient")
         else:
             conf.DEFINE('WITH_DNS_UPDATES', 1)
-    else:
-        conf.SET_TARGET_TYPE('uuid', 'EMPTY')
     conf.CHECK_HEADERS('valgrind.h valgrind/valgrind.h valgrind/memcheck.h')
     if Options.options.developer:
         if conf.CONFIG_SET('HAVE_VALGRIND_H') or conf.CONFIG_SET('HAVE_VALGRIND_VALGRIND_H'):
@@ -1023,6 +989,7 @@ int i; i = PAM_RADIO_TYPE;
 ''',
                 'HAVE_LINUX_NETLINK_H',
                 msg="Checking whether Linux netlink is available"):
+
         conf.CHECK_CODE('''
 #include <bits/sockaddr.h>
 #include <linux/netlink.h>
@@ -1030,10 +997,6 @@ int i; i = PAM_RADIO_TYPE;
 ''',
                 'HAVE_LINUX_RTNETLINK_H',
                 msg='Checking whether Linux rtnetlink is available')
-    if conf.CHECK_TYPE('struct dirent64', headers='sys/types.h dirent.h') and conf.CONFIG_SET('HAVE_READDIR64'):
-        conf.DEFINE('HAVE_STRUCT_DIRENT64', '1')
-    else:
-        conf.undefine('HAVE_STRUCT_DIRENT64')
 
     conf.CHECK_CODE('''
 #include "../tests/fcntl_lock.c"
@@ -1043,41 +1006,18 @@ int i; i = PAM_RADIO_TYPE;
                 execute=True,
                 msg='Checking whether fcntl locking is available')
 
-    conf.CHECK_CODE('''
-#include "../tests/fcntl_lock64.c"
-''',
-                'HAVE_BROKEN_FCNTL64_LOCKS',
-                addmain=False,
-                execute=True,
-                msg='Checking whether fcntl64 locks are broken')
-
-    if not conf.CONFIG_SET('HAVE_BROKEN_FCNTL64_LOCKS'):
-        conf.CHECK_CODE('''
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
-#include <stdio.h>
+# glibc up to 2.3.6 had dangerously broken posix_fallocate(). DON'T USE IT.
+    if not conf.CHECK_CODE('''
+#define _XOPEN_SOURCE 600
 #include <stdlib.h>
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-
-#ifdef HAVE_SYS_FCNTL_H
-#include <sys/fcntl.h>
+#if defined(__GLIBC__) && ((__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 4))
+#error probably broken posix_fallocate
 #endif
-main() { struct flock64 fl64;
-#if defined(F_SETLKW64) && defined(F_SETLK64) && defined(F_GETLK64)
-exit(0);
-#else
-exit(1);
-#endif
-}
 ''',
-                'HAVE_STRUCT_FLOCK64',
-                addmain=False,
-                execute=True,
-                msg="Checking whether the flock64 struct is available")
+                           '_HAVE_UNBROKEN_POSIX_FALLOCATE',
+                           msg='Checking for broken posix_fallocate'):
+        conf.DEFINE('HAVE_BROKEN_POSIX_FALLOCATE', '1')
+
 
     conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtim.tv_nsec',
                                 define='HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC') # Linux, Solaris
@@ -1119,8 +1059,6 @@ ssize_t err = posix_fadvise(0,0,0x80000,POSIX_FADV_WILLNEED);
                         'SYSCONF%s' % v,
                         msg='Checking whether sysconf(%s) is available' % v)
 
-    conf.CHECK_DECLS('__NR_inotify_init', reverse=True, headers='asm/unistd.h')
-
     conf.CHECK_CODE('''
 #include <sys/syscall.h>
 #include <unistd.h>
@@ -1210,21 +1148,9 @@ main() {
                     msg='Checking for ftruncate extend',
                     addmain=False,
                     execute=True)
-    if os.getenv('RUN_FROM_BUILD_FARM'):
-        Logs.info("enabling buildfarm hacks")
-        conf.DEFINE('ENABLE_BUILD_FARM_HACKS', '1')
 
     if Options.options.with_sendfile_support:
         if (host_os.rfind('linux') > -1) or (host_os.rfind('gnu') > -1) or (host_os.rfind('k*bsd*-gnu') > -1) or (host_os.rfind('kopensolaris*-gnu') > -1):
-            conf.CHECK_CODE('''
-                            int tofd, fromfd;
-                            off64_t offset;
-                            size_t total;
-                            ssize_t nwritten = sendfile64(tofd, fromfd, &offset, total);
-                            ''',
-                            '_HAVE_SENDFILE64',
-                            headers='sys/sendfile',
-                            msg='Checking for linux sendfile64 support')
             conf.CHECK_CODE('''
                             int tofd, fromfd;
                             off_t offset;
@@ -1232,32 +1158,13 @@ main() {
                             ssize_t nwritten = sendfile(tofd, fromfd, &offset, total);
                             ''',
                             '_HAVE_SENDFILE',
-                            headers='sys/sendfile',
+                            headers='sys/sendfile.h',
                             msg='Checking for linux sendfile support')
 
-            # Try and cope with broken Linux sendfile....
-            conf.CHECK_CODE('''#if defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
-                            #undef _FILE_OFFSET_BITS
-                            #endif
-                            #include <sys/sendfile.h>
-                            int tofd, fromfd;
-                            off_t offset;
-                            size_t total;
-                            ssize_t nwritten = sendfile(tofd, fromfd, &offset, total);
-                            ''',
-                            '_HAVE_BROKEN_LINUX_SENDFILE',
-                            msg='Checking for broken linux sendfile support')
-            if conf.CONFIG_SET('_HAVE_SENDFILE64'):
-                conf.DEFINE('HAVE_SENDFILE64', '1')
-                conf.DEFINE('LINUX_SENDFILE_API', '1')
-                conf.DEFINE('WITH_SENDFILE', '1')
-            elif conf.CONFIG_SET('_HAVE_SENDFILE'):
+            if conf.CONFIG_SET('_HAVE_SENDFILE'):
                 conf.DEFINE('HAVE_SENDFILE', '1')
                 conf.DEFINE('LINUX_SENDFILE_API', '1')
                 conf.DEFINE('WITH_SENDFILE', '1')
-            elif conf.CONFIG_SET('_HAVE_BROKEN_LINUX_SENDFILE'):
-                conf.DEFINE('LINUX_BROKEN_SENDFILE_API', '1')
-                conf.DEFINE('WITH_SENDFILE', '1')
         elif (host_os.rfind('freebsd') > -1) or (host_os.rfind('dragonfly') > -1):
             conf.CHECK_CODE('''
                             #include <sys/types.h>
@@ -1282,21 +1189,30 @@ main() {
                 conf.DEFINE('HAVE_SENDFILE', '1')
                 conf.DEFINE('FREEBSD_SENDFILE_API', '1')
                 conf.DEFINE('WITH_SENDFILE', '1')
-        elif (host_os.rfind('hpux') > -1):
+        elif (host_os.rfind('darwin') > -1):
             conf.CHECK_CODE('''
+                            #include <sys/types.h>
                             #include <sys/socket.h>
                             #include <sys/uio.h>
-                            int fromfd, tofd;
-                            size_t total=0;
-                            struct iovec hdtrl[2];
-                            ssize_t nwritten;
-                            off64_t offset;
-                            hdtrl[0].iov_base = 0;
-                            hdtrl[0].iov_len = 0;
-                            nwritten = sendfile64(tofd, fromfd, offset, total, &hdtrl[0], 0);
+                            int fromfd, tofd, ret;
+                            off_t offset, nwritten;
+                            struct sf_hdtr hdr;
+                            struct iovec hdtrl;
+                            hdr.headers = &hdtrl;
+                            hdr.hdr_cnt = 1;
+                            hdr.trailers = (void *)0;
+                            hdr.trl_cnt = 0;
+                            hdtrl.iov_base = (void *)0;
+                            hdtrl.iov_len = 0;
+                           ret = sendfile(fromfd, tofd, offset, &nwritten, &hdr, 0);
                             ''',
-                            '_HAVE_SENDFILE64',
-                            msg='Checking for hpux sendfile64 support')
+                            '_HAVE_SENDFILE',
+                            msg='Checking for darwin sendfile support')
+            if conf.CONFIG_SET('_HAVE_SENDFILE'):
+                conf.DEFINE('HAVE_SENDFILE', '1')
+                conf.DEFINE('DARWIN_SENDFILE_API', '1')
+                conf.DEFINE('WITH_SENDFILE', '1')
+        elif (host_os.rfind('hpux') > -1) or (host_os.rfind('osf') > -1):
             conf.CHECK_CODE('''
                             #include <sys/socket.h>
                             #include <sys/uio.h>
@@ -1310,37 +1226,13 @@ main() {
                             nwritten = sendfile(tofd, fromfd, offset, total, &hdtrl[0], 0);
                             ''',
                             '_HAVE_SENDFILE',
-                            msg='Checking for hpux sendfile support')
-            if conf.CONFIG_SET('_HAVE_SENDFILE64'):
-                conf.DEFINE('HAVE_SENDFILE64', '1')
-                conf.DEFINE('HPUX_SENDFILE_API', '1')
-                conf.DEFINE('WITH_SENDFILE', '1')
-            elif conf.CONFIG_SET('_HAVE_SENDFILE'):
+                            msg='Checking for osf/hpux sendfile support')
+            if conf.CONFIG_SET('_HAVE_SENDFILE'):
                 conf.DEFINE('HAVE_SENDFILE', '1')
                 conf.DEFINE('HPUX_SENDFILE_API', '1')
                 conf.DEFINE('WITH_SENDFILE', '1')
         elif (host_os.rfind('solaris') > -1):
             conf.CHECK_FUNCS_IN('sendfile', 'sendfilev')
-            conf.CHECK_CODE('''
-                            #include <sys/sendfile.h>
-                            int sfvcnt;
-                            size_t xferred;
-                            struct sendfilevec vec[2];
-                            ssize_t nwritten;
-                            int tofd;
-                            sfvcnt = 2;
-                            vec[0].sfv_fd = SFV_FD_SELF;
-                            vec[0].sfv_flag = 0;
-                            vec[0].sfv_off = 0;
-                            vec[0].sfv_len = 0;
-                            vec[1].sfv_fd = 0;
-                            vec[1].sfv_flag = 0;
-                            vec[1].sfv_off = 0;
-                            vec[1].sfv_len = 0;
-                            nwritten = sendfilev64(tofd, vec, sfvcnt, &xferred);
-                            ''',
-                            '_HAVE_SENDFILEV64',
-                            msg='Checking for solaris sendfilev64 support')
             conf.CHECK_CODE('''
                             #include <sys/sendfile.h>,
                             int sfvcnt;
@@ -1361,11 +1253,7 @@ main() {
                             ''',
                             '_HAVE_SENDFILEV',
                             msg='Checking for solaris sendfilev support')
-            if conf.CONFIG_SET('_HAVE_SENDFILEV64'):
-                conf.DEFINE('HAVE_SENDFILEV64', '1')
-                conf.DEFINE('SOLARIS_SENDFILE_API', '1')
-                conf.DEFINE('WITH_SENDFILE', '1')
-            elif conf.CONFIG_SET('_HAVE_SENDFILEV'):
+            if conf.CONFIG_SET('_HAVE_SENDFILEV'):
                 conf.DEFINE('HAVE_SENDFILEV', '1')
                 conf.DEFINE('SOLARIS_SENDFILE_API', '1')
                 conf.DEFINE('WITH_SENDFILE', '1')
@@ -1376,7 +1264,6 @@ main() {
                             size_t total=0;
                             struct sf_parms hdtrl;
                             ssize_t nwritten;
-                            off64_t offset;
                             hdtrl.header_data = 0;
                             hdtrl.header_length = 0;
                             hdtrl.file_descriptor = fromfd;
@@ -1411,16 +1298,89 @@ main() {
     if Options.options.with_quotas:
         # For quotas on Veritas VxFS filesystems
         conf.CHECK_HEADERS('sys/fs/vx_quota.h')
-        # For quotas on Linux XFS filesystems
-        conf.CHECK_HEADERS('linux/dqblk_xfs.h')
         # For sys/quota.h and linux/quota.h
         conf.CHECK_HEADERS('sys/quota.h')
+        # For quotas on BSD systems
+        conf.CHECK_HEADERS('ufs/ufs/quota.h')
+        # For quotas on Linux XFS filesystems
+        if conf.CHECK_HEADERS('xfs/xqm.h'):
+            conf.DEFINE('HAVE_XFS_QUOTAS', '1')
+        else:
+            # For Irix XFS
+            conf.CHECK_CODE('''
+                #include "confdefs.h"
+                #ifdef HAVE_SYS_TYPES_H
+                #include <sys/types.h>
+                #endif
+                #ifdef HAVE_ASM_TYPES_H
+                #include <asm/types.h>
+                #endif
+                #include <sys/quota.h>
+                int i = Q_XGETQUOTA;''',
+                define='HAVE_XFS_QUOTAS',
+                msg='for XFS QUOTA in <sys/quota.h>',
+                execute=False,
+                local_include=False)
+        
+        # For IRIX like dqb_isoftlimit instead of dqb_fsoftlimit in struc dqblk
+        conf.CHECK_STRUCTURE_MEMBER('struct dqblk', 'dqb_fsoftlimit', define='HAVE_DQB_FSOFTLIMIT',
+                                headers='sys/quota.h')
+        #darwin style quota bytecount
+        conf.CHECK_STRUCTURE_MEMBER('struct dqblk', 'dqb_curbytes', define='HAVE_STRUCT_DQBLK_DQB_CURBYTES',
+                                headers='sys/quota.h')
+        if conf.CHECK_HEADERS('rpcsvc/rquota.h'):
+            conf.DEFINE('HAVE_NFS_QUOTAS', '1')
+            conf.CHECK_STRUCTURE_MEMBER('struct getquota_rslt', 'getquota_rslt_u',
+                                        define='HAVE_GETQUOTA_RSLT_GETQUOTA_RSLT_U',
+                                        headers='rpcsvc/rquota.h')
+
+        if (host_os.rfind('linux') > -1):
+            conf.DEFINE('HAVE_QUOTACTL_LINUX', '1')
+        elif not conf.CONFIG_SET("HAVE_XFS_QUOTAS"):
+            if not conf.CHECK_CODE('''
+                #define HAVE_QUOTACTL_4A 1
+                #define AUTOCONF_TEST 1
+                #include "../tests/sysquotas.c"
+                ''',
+                                   cflags=conf.env['WERROR_CFLAGS'],
+                                   define='HAVE_QUOTACTL_4A',
+                                   msg='for QUOTACTL_4A: long quotactl(int cmd, char *special, qid_t id, caddr_t addr)',
+                                   execute=True,
+                                   addmain=False):
+
+                conf.CHECK_CODE('''
+                #define HAVE_QUOTACTL_4B 1
+                #define AUTOCONF_TEST 1
+                #include "../tests/sysquotas.c"
+                ''',
+                                cflags=conf.env['WERROR_CFLAGS'],
+                                define='HAVE_QUOTACTL_4B',
+                                msg='for QUOTACTL_4B:  int quotactl(const char *path, int cmd, int id, char *addr)',
+                                execute=True,
+                                addmain=False)
 
+        conf.CHECK_CODE('''
+                     clnt_create("", RQUOTAPROG, RQUOTAVERS, "udp");
+''', 
+                        headers="rpc/rpc.h rpc/types.h rpcsvc/rquota.h rpc/nettype.h rpc/xdr.h", 
+                        define='HAVE_NFS_QUOTAS',
+                        msg='for NFS QUOTAS',
+                        execute=True,
+                        local_include=False)
+
+        if conf.CONFIG_SET('HAVE_QUOTACTL_LINUX') or \
+           conf.CONFIG_SET('HAVE_QUOTACTL_4A') or \
+           conf.CONFIG_SET('HAVE_QUOTACTL_4B') or \
+           conf.CONFIG_SET('HAVE_XFS_QUOTAS'):
+            conf.DEFINE('HAVE_SYS_QUOTAS', '1')
+            conf.DEFINE('WITH_QUOTAS', '1')
 
     #
     # checking for clustering extensions (CTDB)
     #
-    if not Options.options.with_cluster_support:
+    if Options.options.with_cluster_support == False:
+        # configure is called with --without-cluster-support,
+        # so don't check for and build w/o ctdb support.
         have_cluster_support = False
 
     else:
@@ -1434,6 +1394,12 @@ main() {
         else:
             includes = ''
 
+        if not conf.env.USING_SYSTEM_TDB:
+            includes = includes + ' ' + srcdir + '/lib/tdb/include'
+
+        if not conf.env.USING_SYSTEM_TALLOC:
+            includes = includes + ' ' + srcdir + '/lib/talloc'
+
         have_cluster_support = True
         ctdb_broken = ""
 
@@ -1487,6 +1453,28 @@ main() {
                 have_cluster_support = False
                 ctdb_broken = "ctdb_private.h is required for cluster support"
 
+        if have_cluster_support:
+            conf.CHECK_CODE('''
+                #define NO_CONFIG_H
+                #include "replace.h"
+                #include "system/wait.h"
+                #include "system/network.h"
+                #define private #error __USED_RESERVED_WORD_private__
+                #include <talloc.h>
+                #include <tdb.h>
+                #include <ctdb.h>
+                #include <ctdb_protocol.h>
+
+                int main(void)
+                {
+                    return 0;
+                }
+                ''',
+                'HAVE_CTDB_PROTOCOL_H',
+                addmain=False,
+                includes=includes,
+                msg='Checking for header ctdb_protocol.h')
+
         if have_cluster_support:
             conf.CHECK_CODE('''
                 #define NO_CONFIG_H
@@ -1623,14 +1611,16 @@ main() {
         Logs.info("building with cluster support")
         conf.DEFINE('CLUSTER_SUPPORT', 1);
     else:
-        if not Options.options.with_cluster_support:
-            Logs.info("building without cluster support")
+        if Options.options.with_cluster_support == False:
+            Logs.info("building without cluster support (--without-cluster-support)")
+        elif Options.options.with_cluster_support == True:
+            Logs.error("Cluster support not available: " + ctdb_broken)
+            conf.fatal("Cluster support not found, but --with-cluster-support was specified")
         else:
-            Logs.warn("building without cluster support: " + ctdb_broken)
+            Logs.info("building without cluster support: " + ctdb_broken)
         conf.undefine('CLUSTER_SUPPORT')
 
 
-
     conf.CHECK_CODE('__attribute__((destructor)) static void cleanup(void) { }',
                     'HAVE_FUNCTION_ATTRIBUTE_DESTRUCTOR',
                     addmain=False,
@@ -1661,7 +1651,7 @@ main() {
             PTHREAD_CFLAGS='-D_THREAD_SAFE -pthread'
             PTHREAD_LDFLAGS='-pthread'
     if PTHREAD_LDFLAGS == 'error':
-        if conf.CHECK_FUNC('pthread_attr_init'):
+        if conf.CHECK_FUNCS('pthread_attr_init'):
             PTHREAD_CFLAGS='-D_REENTRANT'
             PTHREAD_LDFLAGS='-lpthread'
     # especially for HP-UX, where the CHECK_FUNC macro fails to test for
@@ -1687,34 +1677,35 @@ main() {
     if conf.CHECK_HEADERS('gpfs_gpl.h'):
         conf.DEFINE('HAVE_GPFS', '1')
 
-    # Note that all charset 'modules' must actually be static, due to dependency loop issues 
-    # if we include the module loader in iconv
-
-    default_static_modules=TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam
-                                      auth_sam auth_unix auth_winbind auth_wbc auth_server
+    default_static_modules.extend(TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam
+                                      auth_sam auth_unix auth_winbind auth_wbc
                                       auth_domain auth_builtin vfs_default
                                       nss_info_template idmap_tdb idmap_passdb
-                                      idmap_nss''')
+                                      idmap_nss'''))
 
-    default_shared_modules=TO_LIST('''vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk
+    default_shared_modules.extend(TO_LIST('''vfs_recycle vfs_audit vfs_extd_audit vfs_full_audit vfs_netatalk
                                       vfs_fake_perms vfs_default_quota vfs_readonly vfs_cap
                                       vfs_expand_msdfs vfs_shadow_copy vfs_shadow_copy2 
-                                      auth_script vfs_readahead vfs_xattr_tdb
+                                      auth_script vfs_readahead vfs_xattr_tdb vfs_posix_eadb
                                       vfs_streams_xattr vfs_streams_depot vfs_acl_xattr vfs_acl_tdb
                                       vfs_smb_traffic_analyzer vfs_preopen vfs_catia vfs_scannedonly
+                                     vfs_media_harmony
                                       vfs_crossrename vfs_linux_xfs_sgid
-                                      vfs_time_audit idmap_autorid''')
+                                      vfs_time_audit idmap_autorid idmap_tdb2
+                                      idmap_rid idmap_hash'''))
 
     if Options.options.developer:
-        default_static_modules.extend(TO_LIST('pdb_ads auth_netlogond charset_weird'))
+        default_static_modules.extend(TO_LIST('charset_weird'))
         default_shared_modules.extend(TO_LIST('perfcount_test'))
         default_shared_modules.extend(TO_LIST('vfs_skel_opaque vfs_skel_transparent vfs_shadow_copy_test'))
         default_shared_modules.extend(TO_LIST('auth_skel pdb_test'))
 
-    default_static_modules.extend(TO_LIST('pdb_samba4 auth_samba4 vfs_dfs_samba4'))
+    if Options.options.enable_selftest or Options.options.developer:
+        default_shared_modules.extend(TO_LIST('vfs_fake_acls'))
+        
 
-    if Options.options.with_acl_support and conf.CONFIG_SET('HAVE_POSIX_ACLS'):
-        default_static_modules.extend(TO_LIST('vfs_posixacl'))
+    if conf.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
+        default_static_modules.extend(TO_LIST('pdb_samba_dsdb auth_samba4 vfs_dfs_samba4'))
 
     if conf.CONFIG_SET('HAVE_FREEBSD_SUNACL_H'):
         default_shared_modules.extend(TO_LIST('vfs_zfsacl'))
@@ -1725,12 +1716,18 @@ main() {
     if conf.CONFIG_SET('HAVE_STATFS_F_FSID'):
         default_shared_modules.extend(TO_LIST('vfs_fileid'))
 
-    if conf.CONFIG_SET('HAVE_AIO') and (conf.CONFIG_SET('HAVE_MSGHDR_MSG_CONTROL') or conf.CONFIG_SET('HAVE_MSGHDR_MSG_ACCTRIGHTS')):
+    if (conf.CONFIG_SET('HAVE_MSGHDR_MSG_CONTROL') or conf.CONFIG_SET('HAVE_MSGHDR_MSG_ACCTRIGHTS')):
         default_shared_modules.extend(TO_LIST('vfs_aio_fork'))
 
-    if conf.CONFIG_SET('HAVE_AIO') and Options.options.with_pthreadpool:
+    if Options.options.with_pthreadpool:
         default_shared_modules.extend(TO_LIST('vfs_aio_pthread'))
 
+    if conf.CONFIG_SET('HAVE_AIO'):
+        default_shared_modules.extend(TO_LIST('vfs_aio_posix'))
+
+    if conf.CONFIG_SET('HAVE_LINUX_KERNEL_AIO'):
+        default_shared_modules.extend(TO_LIST('vfs_aio_linux'))
+
     if conf.CONFIG_SET('HAVE_LDAP'):
         default_static_modules.extend(TO_LIST('pdb_ldap idmap_ldap'))
 
@@ -1738,7 +1735,7 @@ main() {
         default_static_modules.extend(TO_LIST('charset_macosxfs'))
 
     if conf.CONFIG_SET('HAVE_GPFS'):
-        default_shared_modules.extend(TO_LIST('vfs_gpfs vfs_gpfs_hsm_notify'))
+       default_shared_modules.extend(TO_LIST('vfs_gpfs'))
 
     explicit_shared_modules = TO_LIST(Options.options.shared_modules, delimiter=',')
     explicit_static_modules = TO_LIST(Options.options.static_modules, delimiter=',')
@@ -1755,6 +1752,12 @@ main() {
             final_static_modules.remove(m)
         final_shared_modules.append(m)
 
+    if ("auth_domain" not in final_static_modules) or \
+            ("auth_builtin" not in final_static_modules) or \
+            ("auth_sam" not in final_static_modules) or \
+            ("auth_winbind" not in final_static_modules):
+        raise Utils.WafError('These auth modules MUST be configured as static modules: auth_domain, auth_builtin, auth_sam, auth_winbind')
+
     conf.env['static_modules'] = final_static_modules
     conf.env['shared_modules'] = final_shared_modules