summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-04-29 20:47:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:51:22 -0500
commit9b4e6c7ea6f9be7b7a29a9a467c7131342caa6b1 (patch)
treeaa3472fa33bb9a0e53015387f10bd5c5f5cd2080 /source3
parent77182a81f0e370584d37dc9368f0697b8cf69afd (diff)
downloadsamba-9b4e6c7ea6f9be7b7a29a9a467c7131342caa6b1.tar.gz
samba-9b4e6c7ea6f9be7b7a29a9a467c7131342caa6b1.tar.bz2
samba-9b4e6c7ea6f9be7b7a29a9a467c7131342caa6b1.zip
r410: merge tpot's changeset 353 from trunk:
Move msdfs.c into the source/smbd directory and remove source/msdfs. metze (This used to be commit 88e6e6d29ca14e0cddbc1df611051a96568dc0c9)
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in8
-rw-r--r--source3/smbd/msdfs.c (renamed from source3/msdfs/msdfs.c)0
2 files changed, 3 insertions, 5 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 32aff6af84..36dc0dc1a2 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -361,10 +361,10 @@ SMBD_OBJ_SRV = smbd/files.o smbd/chgpasswd.o smbd/connection.o \
printing/printfsp.o lib/sysquotas.o lib/sysquotas_linux.o \
lib/sysquotas_xfs.o lib/sysquotas_4A.o \
smbd/change_trust_pw.o smbd/fake_file.o \
- smbd/quotas.o smbd/ntquotas.o lib/afs.o \
+ smbd/quotas.o smbd/ntquotas.o lib/afs.o smbd/msdfs.o \
$(MANGLE_OBJ) @VFS_STATIC@
-SMBD_OBJ_BASE = $(PARAM_OBJ) $(SMBD_OBJ_SRV) $(MSDFS_OBJ) $(LIBSMB_OBJ) \
+SMBD_OBJ_BASE = $(PARAM_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
$(RPC_SERVER_OBJ) $(RPC_PARSE_OBJ) $(SECRETS_OBJ) \
$(LOCKING_OBJ) $(PASSDB_OBJ) $(PRINTING_OBJ) $(PROFILE_OBJ) \
$(LIB_OBJ) $(PRINTBACKEND_OBJ) $(OPLOCK_OBJ) \
@@ -381,8 +381,6 @@ PRINTING_OBJ = printing/pcap.o printing/print_svid.o \
PRINTBACKEND_OBJ = printing/printing.o printing/nt_printing.o printing/notify.o \
printing/printing_db.o
-MSDFS_OBJ = msdfs/msdfs.o
-
SMBD_OBJ = $(SMBD_OBJ_BASE) $(SMBD_OBJ_MAIN)
NMBD_OBJ1 = nmbd/asyncdns.o nmbd/nmbd.o nmbd/nmbd_become_dmb.o \
nmbd/nmbd_become_lmb.o nmbd/nmbd_browserdb.o \
@@ -592,7 +590,7 @@ PROTO_OBJ = $(SMBD_OBJ_MAIN) \
$(RPC_PIPE_OBJ) $(RPC_PARSE_OBJ) $(KRBCLIENT_OBJ) \
$(AUTH_OBJ) $(PARAM_OBJ) $(LOCKING_OBJ) $(SECRETS_OBJ) \
$(PRINTING_OBJ) $(PRINTBACKEND_OBJ) $(OPLOCK_OBJ) $(NOTIFY_OBJ) \
- $(PASSDB_OBJ) $(GROUPDB_OBJ) $(MSDFS_OBJ) \
+ $(PASSDB_OBJ) $(GROUPDB_OBJ) \
$(READLINE_OBJ) $(PROFILE_OBJ) $(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) \
$(LIB_SMBD_OBJ) $(AUTH_SAM_OBJ) $(REGISTRY_OBJ) $(POPT_LIB_OBJ) \
$(RPC_LSA_OBJ) $(RPC_NETLOG_OBJ) $(RPC_SAMR_OBJ) $(RPC_REG_OBJ) $(RPC_LSA_DS_OBJ) \
diff --git a/source3/msdfs/msdfs.c b/source3/smbd/msdfs.c
index c66f0477a8..c66f0477a8 100644
--- a/source3/msdfs/msdfs.c
+++ b/source3/smbd/msdfs.c