X-Git-Url: http://git.samba.org/?p=samba.git;a=blobdiff_plain;f=source3%2FMakefile.in;h=6c4ac2cdcd7153deea91bf22dc240dabc00383ad;hp=1389293ad8d9bd5f2a9cb751c8a6e312f2555a48;hb=bd9309b91c2dd19fbbc8be73732780ee0aaf8095;hpb=715933a3d3d1023df0d77c1765850e8579b84dfc

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1389293ad8d..6c4ac2cdcd7 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -441,7 +441,6 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \
 	  ../lib/socket/interfaces.o lib/memcache.o \
 	  lib/talloc_dict.o \
 	  lib/serverid.o \
-	  lib/util_sconn.o \
 	  lib/util_transfer_file.o ../lib/async_req/async_sock.o \
 	  lib/addrchange.o \
 	  $(TDB_LIB_OBJ) \
@@ -761,7 +760,7 @@ RPC_CONFIG = rpc_server/rpc_config.o
 
 RPC_SERVICE = rpc_server/rpc_server.o
 
-RPC_CRYPTO = rpc_server/dcesrv_ntlmssp.o \
+RPC_CRYPTO = rpc_server/dcesrv_auth_generic.o \
 		rpc_server/dcesrv_gssapi.o \
 		rpc_server/dcesrv_spnego.o
 
@@ -869,6 +868,7 @@ VFS_READAHEAD_OBJ = modules/vfs_readahead.o
 VFS_TSMSM_OBJ = modules/vfs_tsmsm.o
 VFS_FILEID_OBJ = modules/vfs_fileid.o
 VFS_AIO_FORK_OBJ = modules/vfs_aio_fork.o
+VFS_AIO_PTHREAD_OBJ = modules/vfs_aio_pthread.o
 VFS_PREOPEN_OBJ = modules/vfs_preopen.o
 VFS_SYNCOPS_OBJ = modules/vfs_syncops.o
 VFS_ACL_XATTR_OBJ = modules/vfs_acl_xattr.o
@@ -909,7 +909,7 @@ AUTH_OBJ = auth/auth.o @AUTH_STATIC@ auth/auth_util.o auth/token_util.o \
 	   auth/user_info.o \
 	   auth/user_util.o \
 	   auth/user_krb5.o \
-	   auth/auth_compat.o auth/auth_ntlmssp.o \
+	   auth/auth_compat.o auth/auth_ntlmssp.o auth/auth_generic.o \
 	   $(PLAINTEXT_AUTH_OBJ) $(SLCACHE_OBJ) $(DCUTIL_OBJ)
 
 MANGLE_OBJ = smbd/mangle.o smbd/mangle_hash.o smbd/mangle_hash2.o
@@ -1264,6 +1264,7 @@ SMBTORTURE_OBJ1 = torture/torture.o torture/nbio.o torture/scanner.o torture/uta
 		torture/test_posix_append.o \
 		torture/test_smb2.o \
 		torture/test_authinfo_structs.o \
+		torture/test_cleanup.o \
 		torture/t_strappend.o
 
 SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) $(TLDAP_OBJ) \
@@ -3055,6 +3056,10 @@ bin/aio_fork.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_AIO_FORK_OBJ)
 	@echo "Building plugin $@"
 	@$(SHLD_MODULE) $(VFS_AIO_FORK_OBJ)
 
+bin/aio_pthread.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_AIO_PTHREAD_OBJ)
+	@echo "Building plugin $@"
+	@$(SHLD_MODULE) $(VFS_AIO_PTHREAD_OBJ)
+
 bin/preopen.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_PREOPEN_OBJ)
 	@echo "Building plugin $@"
 	@$(SHLD_MODULE) $(VFS_PREOPEN_OBJ)
@@ -3515,7 +3520,7 @@ S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin:$$$(LIB_PATH_VAR)"
 
 test:: all torture timelimit
 	@LIB_PATH_VAR=$(LIB_PATH_VAR) $(S3_LD_LIBPATH_OVERRIDE) \
-		SAMBA4SHAREDDIR="$(builddir)/bin/shared" SMBTORTURE4=$(smbtorture4_path) \
+		SMBTORTURE4=$(smbtorture4_path) \
 		NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/../nsswitch/libnss_winbind.so" \
 		SELFTESTDIR="$(selftestdir)" SELFTESTPREFIX="$(selftest_prefix)" \
 		SOURCEDIR="$(srcdir)" \