TDB_LIB_OBJ = lib/util_tdb.o ../lib/util/util_tdb.o \
../lib/tdb_wrap/tdb_wrap.o \
- lib/dbwrap/dbwrap.o \
+ ../lib/dbwrap/dbwrap.o \
lib/dbwrap/dbwrap_open.o \
- lib/dbwrap/dbwrap_tdb.o \
+ ../lib/dbwrap/dbwrap_tdb.o \
lib/dbwrap/dbwrap_ctdb.o \
lib/g_lock.o \
- lib/dbwrap/dbwrap_cache.o \
+ ../lib/dbwrap/dbwrap_cache.o \
lib/dbwrap/dbwrap_watch.o \
- lib/dbwrap/dbwrap_rbt.o
+ ../lib/dbwrap/dbwrap_rbt.o \
+ ../lib/dbwrap/dbwrap_util.o
TDB_VALIDATE_OBJ = lib/tdb_validate.o
../lib/util/charset/util_unistr_w.o ../lib/util/charset/codepoints.o ../lib/util/charset/util_str.o lib/util_file.o \
lib/util.o lib/util_malloc.o lib/namearray.o lib/util_cmdline.o lib/util_names.o \
lib/util_sock.o lib/sock_exec.o lib/util_sec.o \
- lib/substitute.o lib/substitute_generic.o ../lib/util/substitute.o lib/dbwrap/dbwrap_util.o \
+ lib/substitute.o lib/substitute_generic.o ../lib/util/substitute.o \
lib/ms_fnmatch.o ../lib/util/ms_fnmatch.o lib/errmap_unix.o ../libcli/util/errmap_unix.o \
lib/tallocmsg.o lib/dmallocmsg.o \
../libcli/smb/smb_signing.o \
lib/file_id.o lib/idmap_cache.o \
../libcli/security/dom_sid.o ../libcli/security/security_descriptor.o \
../libcli/security/security_token.o ../libcli/security/util_sid.o \
- ../libcli/smb/util.o
+ ../libcli/smb/util.o ../lib/util/idtree.o
LIB_DUMMY_OBJ = lib/smbd_shim.o lib/dummyparam.o
LIB_NONSMBD_OBJ = $(LIB_OBJ) $(LIB_DUMMY_OBJ)
../lib/util/asn1.o \
../libcli/auth/spnego_parse.o \
../libcli/auth/ntlm_check.o \
- ../libcli/auth/krb5_wrap.o \
libsmb/ntlmssp.o \
libsmb/ntlmssp_wrap.o \
libsmb/auth_generic.o \
- libsmb/clikrb5.o \
+ ../lib/krb5_wrap/krb5_samba.o \
libsmb/clispnego.o \
../auth/gensec/gensec.o \
../auth/gensec/gensec_start.o \
CLDAP_OBJ = libads/cldap.o \
../libcli/cldap/cldap.o \
- ../lib/util/idtree.o \
$(LIBCLI_LDAP_MESSAGE_OBJ) $(LIBCLI_LDAP_NDR_OBJ)
TLDAP_OBJ = lib/tldap.o lib/tldap_util.o lib/util_tsock.o
../libcli/smb/read_smb.o \
../libcli/smb/smbXcli_base.o \
../libcli/smb/smb1cli_trans.o \
- ../libcli/smb/smb2_session.o \
- libsmb/smb2cli_session.o \
+ ../libcli/smb/smb2cli_session.o \
libsmb/smb2cli_tcon.o \
- libsmb/smb2cli_create.o \
+ ../libcli/smb/smb2cli_create.o \
../libcli/smb/smb2_create_blob.o \
../libcli/smb/smb2_signing.o \
- libsmb/smb2cli_close.o \
- libsmb/smb2cli_flush.o \
- libsmb/smb2cli_read.o \
- libsmb/smb2cli_write.o \
- libsmb/smb2cli_query_directory.o \
+ ../libcli/smb/smb2cli_close.o \
+ ../libcli/smb/smb2cli_flush.o \
+ ../libcli/smb/smb2cli_read.o \
+ ../libcli/smb/smb2cli_write.o \
+ ../libcli/smb/smb2cli_query_directory.o \
+ ../libcli/smb/smb2cli_ioctl.o \
+ ../libcli/smb/smb2cli_query_info.o \
+ ../libcli/smb/smb2cli_set_info.o \
libsmb/cli_np_tstream.o \
libsmb/smbsock_connect.o \
$(LIBSAMBA_OBJ) \
$(POPT_LIB_OBJ) \
$(REGFIO_OBJ)
-OPLOCK_OBJ = smbd/oplock.o smbd/oplock_irix.o smbd/oplock_linux.o \
- smbd/oplock_onefs.o
+OPLOCK_OBJ = smbd/oplock.o smbd/oplock_irix.o smbd/oplock_linux.o
NOTIFY_OBJ = smbd/notify.o smbd/notify_inotify.o smbd/notify_internal.o \
librpc/gen_ndr/ndr_notify.o
VFS_ACL_XATTR_OBJ = modules/vfs_acl_xattr.o
VFS_ACL_TDB_OBJ = modules/vfs_acl_tdb.o
VFS_SMB_TRAFFIC_ANALYZER_OBJ = modules/vfs_smb_traffic_analyzer.o
-VFS_ONEFS_OBJ = modules/vfs_onefs.o modules/onefs_acl.o modules/onefs_system.o \
- modules/onefs_open.o modules/onefs_streams.o modules/onefs_dir.o \
- modules/onefs_cbrl.o modules/onefs_notify.o modules/onefs_config.o
-VFS_ONEFS_SHADOW_COPY_OBJ = modules/vfs_onefs_shadow_copy.o modules/onefs_shadow_copy.o
-PERFCOUNT_ONEFS_OBJ = modules/perfcount_onefs.o
PERFCOUNT_TEST_OBJ = modules/perfcount_test.o
VFS_DIRSORT_OBJ = modules/vfs_dirsort.o
VFS_SCANNEDONLY_OBJ = modules/vfs_scannedonly.o
AUTH_BUILTIN_OBJ = auth/auth_builtin.o
AUTH_DOMAIN_OBJ = auth/auth_domain.o
AUTH_SAM_OBJ = auth/auth_sam.o auth/check_samsec.o
-AUTH_SERVER_OBJ = auth/auth_server.o
AUTH_UNIX_OBJ = auth/auth_unix.o
AUTH_WINBIND_OBJ = auth/auth_winbind.o
AUTH_WBC_OBJ = auth/auth_wbc.o
torture/test_msg.o \
torture/test_notify.o \
torture/test_dbwrap_watch.o \
+ torture/test_idmap_tdb_common.o \
torture/t_strappend.o
SMBTORTURE_OBJ = $(SMBTORTURE_OBJ1) $(PARAM_OBJ) $(TLDAP_OBJ) \
IDMAP_RW_OBJ = winbindd/idmap_rw.o
-IDMAP_OBJ = winbindd/idmap.o winbindd/idmap_util.o $(IDMAP_RW_OBJ) @IDMAP_STATIC@
+IDMAP_TDB_COMMON_OBJ = winbindd/idmap_tdb_common.o
+
+IDMAP_UTIL_OBJ = winbindd/idmap_util.o $(IDMAP_RW_OBJ) \
+ $(IDMAP_TDB_COMMON_OBJ)
+
+IDMAP_OBJ = winbindd/idmap.o $(IDMAP_UTIL_OBJ) @IDMAP_STATIC@
NSS_INFO_OBJ = winbindd/nss_info.o @NSS_INFO_STATIC@
bin/smbtorture: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
@echo Linking $@
- @$(CC) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) \
+ @$(CC) -o $@ $(SMBTORTURE_OBJ) $(IDMAP_UTIL_OBJ) $(LDFLAGS) $(DYNEXP) \
$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) \
$(LIBTDB_LIBS) $(ZLIB_LIBS) $(LIBWBCLIENT_LIBS)
@echo "Building plugin $@"
@$(SHLD_MODULE) $(AUTH_NETLOGOND_OBJ)
-bin/smbserver.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_SERVER_OBJ)
- @echo "Building plugin $@"
- @$(SHLD_MODULE) $(AUTH_SERVER_OBJ)
-
bin/winbind.@SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_WINBIND_OBJ)
@echo "Building plugin $@"
@$(SHLD_MODULE) $(AUTH_WINBIND_OBJ)
@echo "Building plugin $@"
@$(SHLD_MODULE) $(VFS_ACL_TDB_OBJ)
-bin/onefs.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_ONEFS_OBJ)
- @echo "Building plugin $@"
- @$(SHLD_MODULE) $(VFS_ONEFS_OBJ) @ONEFS_LIBS@
-
-bin/onefs_shadow_copy.@SHLIBEXT@: $(BINARY_PREREQS) $(VFS_ONEFS_SHADOW_COPY_OBJ)
- @echo "Building plugin $@"
- @$(SHLD_MODULE) $(VFS_ONEFS_SHADOW_COPY_OBJ)
-
-bin/pc_onefs.@SHLIBEXT@: $(BINARY_PREREQS) $(PERFCOUNT_ONEFS_OBJ)
- @echo "Building plugin $@"
- @$(SHLD_MODULE) $(PERFCOUNT_ONEFS_OBJ)
-
bin/pc_test.@SHLIBEXT@: $(BINARY_PREREQS) $(PERFCOUNT_TEST_OBJ)
@echo "Building plugin $@"
@$(SHLD_MODULE) $(PERFCOUNT_TEST_OBJ)