summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/smb_server/config.mk15
-rw-r--r--source4/smb_server/smb/negprot.c (renamed from source4/smb_server/negprot.c)0
-rw-r--r--source4/smb_server/smb/nttrans.c (renamed from source4/smb_server/nttrans.c)0
-rw-r--r--source4/smb_server/smb/receive.c (renamed from source4/smb_server/receive.c)0
-rw-r--r--source4/smb_server/smb/reply.c (renamed from source4/smb_server/reply.c)0
-rw-r--r--source4/smb_server/smb/request.c (renamed from source4/smb_server/request.c)0
-rw-r--r--source4/smb_server/smb/search.c (renamed from source4/smb_server/search.c)0
-rw-r--r--source4/smb_server/smb/service.c (renamed from source4/smb_server/service.c)0
-rw-r--r--source4/smb_server/smb/sesssetup.c (renamed from source4/smb_server/sesssetup.c)0
-rw-r--r--source4/smb_server/smb/signing.c (renamed from source4/smb_server/signing.c)0
-rw-r--r--source4/smb_server/smb/srvtime.c (renamed from source4/smb_server/srvtime.c)0
-rw-r--r--source4/smb_server/smb/trans2.c (renamed from source4/smb_server/trans2.c)0
12 files changed, 3 insertions, 12 deletions
diff --git a/source4/smb_server/config.mk b/source4/smb_server/config.mk
index cc2d77d7a2..1dd2632890 100644
--- a/source4/smb_server/config.mk
+++ b/source4/smb_server/config.mk
@@ -7,20 +7,11 @@ INIT_OBJ_FILES = \
smb_server.o
ADD_OBJ_FILES = \
tcon.o \
- negprot.o \
- nttrans.o \
session.o \
- receive.o \
- reply.o \
- request.o \
- search.o \
- service.o \
- sesssetup.o \
- srvtime.o \
- trans2.o \
- signing.o \
management.o
REQUIRED_SUBSYSTEMS = \
- NTVFS LIBPACKET
+ LIBPACKET SMB_PROTOCOL
# End SUBSYSTEM SMB
#######################
+
+include smb/config.mk
diff --git a/source4/smb_server/negprot.c b/source4/smb_server/smb/negprot.c
index a9cc05e251..a9cc05e251 100644
--- a/source4/smb_server/negprot.c
+++ b/source4/smb_server/smb/negprot.c
diff --git a/source4/smb_server/nttrans.c b/source4/smb_server/smb/nttrans.c
index 215b378283..215b378283 100644
--- a/source4/smb_server/nttrans.c
+++ b/source4/smb_server/smb/nttrans.c
diff --git a/source4/smb_server/receive.c b/source4/smb_server/smb/receive.c
index 0ee87698c8..0ee87698c8 100644
--- a/source4/smb_server/receive.c
+++ b/source4/smb_server/smb/receive.c
diff --git a/source4/smb_server/reply.c b/source4/smb_server/smb/reply.c
index eb7b5a1082..eb7b5a1082 100644
--- a/source4/smb_server/reply.c
+++ b/source4/smb_server/smb/reply.c
diff --git a/source4/smb_server/request.c b/source4/smb_server/smb/request.c
index 5491089c8e..5491089c8e 100644
--- a/source4/smb_server/request.c
+++ b/source4/smb_server/smb/request.c
diff --git a/source4/smb_server/search.c b/source4/smb_server/smb/search.c
index 3ec66a0f33..3ec66a0f33 100644
--- a/source4/smb_server/search.c
+++ b/source4/smb_server/smb/search.c
diff --git a/source4/smb_server/service.c b/source4/smb_server/smb/service.c
index 213cf6726b..213cf6726b 100644
--- a/source4/smb_server/service.c
+++ b/source4/smb_server/smb/service.c
diff --git a/source4/smb_server/sesssetup.c b/source4/smb_server/smb/sesssetup.c
index 3f09346243..3f09346243 100644
--- a/source4/smb_server/sesssetup.c
+++ b/source4/smb_server/smb/sesssetup.c
diff --git a/source4/smb_server/signing.c b/source4/smb_server/smb/signing.c
index b461056397..b461056397 100644
--- a/source4/smb_server/signing.c
+++ b/source4/smb_server/smb/signing.c
diff --git a/source4/smb_server/srvtime.c b/source4/smb_server/smb/srvtime.c
index faeda6faf6..faeda6faf6 100644
--- a/source4/smb_server/srvtime.c
+++ b/source4/smb_server/smb/srvtime.c
diff --git a/source4/smb_server/trans2.c b/source4/smb_server/smb/trans2.c
index c9a357523b..c9a357523b 100644
--- a/source4/smb_server/trans2.c
+++ b/source4/smb_server/smb/trans2.c