r14064: - split out MSRPC_PARSE into a speperate subsystem

- build gensec_ntlmssp always static for now, because torture/auth/ntlmssp.c
  needs to access functions from it

metze
(This used to be commit 43733c9556c1c92336780206e3f71bdee6e43eee)

diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk
index eb09a199f0efba1937c27f3cb8186629b62e57a7..22cd373a8a9762f3970008b0e7b590f4f283fb52 100644 (file)
--- a/source4/auth/ntlmssp/config.mk
+++ b/source4/auth/ntlmssp/config.mk
@@ -1,3 +1,7 @@
+[SUBSYSTEM::MSRPC_PARSE]
+PRIVATE_PROTO_HEADER = msrpc_parse.h
+OBJ_FILES = ntlmssp_parse.o
+
 ################################################
 # Start MODULE gensec_ntlmssp
 [MODULE::gensec_ntlmssp]
@@ -8,8 +12,8 @@ PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = ntlmssp.o \
                ntlmssp_sign.o \
                ntlmssp_client.o \
-               ntlmssp_parse.o \
                ntlmssp_server.o
-REQUIRED_SUBSYSTEMS = auth
+REQUIRED_SUBSYSTEMS = auth MSRPC_PARSE
+OUTPUT_TYPE = MERGEDOBJ
 # End MODULE gensec_ntlmssp
 ################################################

diff --git a/source4/auth/ntlmssp/ntlmssp.c b/source4/auth/ntlmssp/ntlmssp.c
index 5d90ceadc3d7630a803720b0e25ce1077fd8411f..fbca803d3bb04990c874435fefe47454ec67f825 100644 (file)
--- a/source4/auth/ntlmssp/ntlmssp.c
+++ b/source4/auth/ntlmssp/ntlmssp.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "auth/auth.h"
 #include "auth/ntlmssp/ntlmssp.h"
+#include "auth/ntlmssp/msrpc_parse.h"
 
 /**
  * Callbacks for NTLMSSP - for both client and server operating modes

diff --git a/source4/auth/ntlmssp/ntlmssp_client.c b/source4/auth/ntlmssp/ntlmssp_client.c
index cc7a37664348785edae4d5d0a5be09ff8910eba1..acb17330fbfbd4038031f3c4f44f027b2d62475e 100644 (file)
--- a/source4/auth/ntlmssp/ntlmssp_client.c
+++ b/source4/auth/ntlmssp/ntlmssp_client.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "auth/auth.h"
 #include "auth/ntlmssp/ntlmssp.h"
+#include "auth/ntlmssp/msrpc_parse.h"
 #include "lib/crypto/crypto.h"
 #include "libcli/auth/proto.h"
 

diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c
index 54eb7f9bff963c794ed0cb2b2b06374b8f23b588..0598ff8f1dbbb741b69b4aa05910043067b2cab3 100644 (file)
--- a/source4/auth/ntlmssp/ntlmssp_server.c
+++ b/source4/auth/ntlmssp/ntlmssp_server.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "auth/auth.h"
 #include "auth/ntlmssp/ntlmssp.h"
+#include "auth/ntlmssp/msrpc_parse.h"
 #include "lib/crypto/crypto.h"
 #include "pstring.h"
 #include "system/filesys.h"

diff --git a/source4/auth/ntlmssp/ntlmssp_sign.c b/source4/auth/ntlmssp/ntlmssp_sign.c
index 8eea4fd8ae77e64503fa4bd94d3bec8fdaaa0d1a..19a8b605c0cb0fec323e708933bbe20f6ddf5c88 100644 (file)
--- a/source4/auth/ntlmssp/ntlmssp_sign.c
+++ b/source4/auth/ntlmssp/ntlmssp_sign.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "auth/auth.h"
 #include "auth/ntlmssp/ntlmssp.h"
+#include "auth/ntlmssp/msrpc_parse.h"
 #include "lib/crypto/crypto.h"
 
 #define CLI_SIGN "session key to client-to-server signing key magic constant"

diff --git a/source4/libcli/auth/config.mk b/source4/libcli/auth/config.mk
index d11f440864749fb5c5617aba4339bdb70fa1d016..18983e1644e8ce5350cd0c5ff49ee9a8dbc741f5 100644 (file)
--- a/source4/libcli/auth/config.mk
+++ b/source4/libcli/auth/config.mk
@@ -6,6 +6,6 @@ OBJ_FILES = credentials.o \
                session.o \
                smbencrypt.o 
 REQUIRED_SUBSYSTEMS = \
-               auth SCHANNELDB gensec_ntlmssp
+               auth SCHANNELDB MSRPC_PARSE
 # End SUBSYSTEM LIBCLI_AUTH
 #################################

diff --git a/source4/libcli/auth/smbencrypt.c b/source4/libcli/auth/smbencrypt.c
index 0ebd78fa7f40f468837c49415a6bbdeb3dc1514e..f267baa4c088e73a8568d86643d136ee8d0c2139 100644 (file)
--- a/source4/libcli/auth/smbencrypt.c
+++ b/source4/libcli/auth/smbencrypt.c
@@ -26,6 +26,7 @@
 #include "system/time.h"
 #include "smb.h"
 #include "auth/ntlmssp/ntlmssp.h"
+#include "auth/ntlmssp/msrpc_parse.h"
 #include "lib/crypto/crypto.h"
 #include "libcli/auth/proto.h"
 #include "pstring.h"