svn commit: samba r14064 - in branches/SAMBA_4_0/source: auth/ntlmssp libcli/auth

[metze at samba.org]

Author: metze
Date: 2006-03-09 12:42:45 +0000 (Thu, 09 Mar 2006)
New Revision: 14064

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14064

Log:
- 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
Modified:
   branches/SAMBA_4_0/source/auth/ntlmssp/
   branches/SAMBA_4_0/source/auth/ntlmssp/config.mk
   branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp.c
   branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_client.c
   branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_server.c
   branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_sign.c
   branches/SAMBA_4_0/source/libcli/auth/config.mk
   branches/SAMBA_4_0/source/libcli/auth/smbencrypt.c


Changeset:

Property changes on: branches/SAMBA_4_0/source/auth/ntlmssp
___________________________________________________________________
Name: svn:ignore
   - proto.h
*.d

   + proto.h
msrpc_parse.h
*.d


Modified: branches/SAMBA_4_0/source/auth/ntlmssp/config.mk
===================================================================
--- branches/SAMBA_4_0/source/auth/ntlmssp/config.mk	2006-03-09 12:28:47 UTC (rev 14063)
+++ branches/SAMBA_4_0/source/auth/ntlmssp/config.mk	2006-03-09 12:42:45 UTC (rev 14064)
@@ -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 @@
 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
 ################################################

Modified: branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp.c
===================================================================
--- branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp.c	2006-03-09 12:28:47 UTC (rev 14063)
+++ branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp.c	2006-03-09 12:42:45 UTC (rev 14064)
@@ -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

Modified: branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_client.c
===================================================================
--- branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_client.c	2006-03-09 12:28:47 UTC (rev 14063)
+++ branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_client.c	2006-03-09 12:42:45 UTC (rev 14064)
@@ -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"
 

Modified: branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_server.c
===================================================================
--- branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_server.c	2006-03-09 12:28:47 UTC (rev 14063)
+++ branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_server.c	2006-03-09 12:42:45 UTC (rev 14064)
@@ -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"

Modified: branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_sign.c
===================================================================
--- branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_sign.c	2006-03-09 12:28:47 UTC (rev 14063)
+++ branches/SAMBA_4_0/source/auth/ntlmssp/ntlmssp_sign.c	2006-03-09 12:42:45 UTC (rev 14064)
@@ -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"

Modified: branches/SAMBA_4_0/source/libcli/auth/config.mk
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/config.mk	2006-03-09 12:28:47 UTC (rev 14063)
+++ branches/SAMBA_4_0/source/libcli/auth/config.mk	2006-03-09 12:42:45 UTC (rev 14064)
@@ -6,6 +6,6 @@
 		session.o \
 		smbencrypt.o 
 REQUIRED_SUBSYSTEMS = \
-		auth SCHANNELDB gensec_ntlmssp
+		auth SCHANNELDB MSRPC_PARSE
 # End SUBSYSTEM LIBCLI_AUTH
 #################################

Modified: branches/SAMBA_4_0/source/libcli/auth/smbencrypt.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/smbencrypt.c	2006-03-09 12:28:47 UTC (rev 14063)
+++ branches/SAMBA_4_0/source/libcli/auth/smbencrypt.c	2006-03-09 12:42:45 UTC (rev 14064)
@@ -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"