diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-03-09 12:42:45 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:52:39 -0500 |
| commit | 7d8424ede21185a978a222f609263506c0e20f4e (patch) | |
| tree | f188c1adf27da59ca2ea96c55674d7187a8a9a96 /source4/auth | |
| parent | da7c2d3a66532f0e41d377f0681a81ab5bc46b45 (diff) | |
| download | samba-7d8424ede21185a978a222f609263506c0e20f4e.tar.gz samba-7d8424ede21185a978a222f609263506c0e20f4e.tar.xz samba-7d8424ede21185a978a222f609263506c0e20f4e.zip | |
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)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/ntlmssp/config.mk | 8 | ||||
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp.c | 1 | ||||
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp_client.c | 1 | ||||
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp_server.c | 1 | ||||
| -rw-r--r-- | source4/auth/ntlmssp/ntlmssp_sign.c | 1 |
5 files changed, 10 insertions, 2 deletions
diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk index eb09a199f0e..22cd373a8a9 100644 --- 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 5d90ceadc3d..fbca803d3bb 100644 --- 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 cc7a3766434..acb17330fbf 100644 --- 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 54eb7f9bff9..0598ff8f1db 100644 --- 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 8eea4fd8ae7..19a8b605c0c 100644 --- 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" |