[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  fcfde9a s4:ntvfs/common/brlock.c - remove unnecessary include "tdb_compat.h"
       via  b759dc9 s4:libnet/py_net.c - fix up includes (in order to find all "struct"s)
       via  50310ad s4:auth - remove unused variables
      from  c033e63 s4:selftest: run the nbt tests before the smb tests

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fcfde9ac86b75176ceeb02dbb3faa05cd53a2716
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Mon Sep 19 13:12:48 2011 +0200

    s4:ntvfs/common/brlock.c - remove unnecessary include "tdb_compat.h"
    
    Attempt to fix bug #8468
    (https://bugzilla.samba.org/show_bug.cgi?id=8468).
    
    Reviewed-by: Jelmer
    
    Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
    Autobuild-Date: Mon Sep 19 18:03:24 CEST 2011 on sn-devel-104

commit b759dc9f39320a38c4f521979c12a23a89959c4c
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Mon Sep 19 10:48:31 2011 +0200

    s4:libnet/py_net.c - fix up includes (in order to find all "struct"s)
    
    Reviewed-by: Jelmer

commit 50310ad75ddef5a809ac674c337880be37feb731
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Mon Sep 19 10:29:57 2011 +0200

    s4:auth - remove unused variables
    
    Reviewed-by: Jelmer

-----------------------------------------------------------------------

Summary of changes:
 source3/auth/auth_samba4.c               |    1 -
 source4/auth/gensec/schannel.c           |    1 -
 source4/auth/ntlmssp/ntlmssp_server.c    |    1 -
 source4/libcli/smb_composite/sesssetup.c |    1 -
 source4/libnet/py_net.c                  |    5 ++---
 source4/ntvfs/common/brlock.c            |    1 -
 6 files changed, 2 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/auth_samba4.c b/source3/auth/auth_samba4.c
index 7315c16..371d4b7 100644
--- a/source3/auth/auth_samba4.c
+++ b/source3/auth/auth_samba4.c
@@ -106,7 +106,6 @@ static NTSTATUS prepare_gensec(TALLOC_CTX *mem_ctx,
 	TALLOC_CTX *frame = talloc_stackframe();
 	struct gensec_security *gensec_ctx;
 	struct imessaging_context *msg_ctx;
-	struct server_id *server_id;
 	struct cli_credentials *server_credentials;
 
 	lp_ctx = loadparm_init_s3(frame, loadparm_s3_context());
diff --git a/source4/auth/gensec/schannel.c b/source4/auth/gensec/schannel.c
index 4587d43..b70d65a 100644
--- a/source4/auth/gensec/schannel.c
+++ b/source4/auth/gensec/schannel.c
@@ -220,7 +220,6 @@ static NTSTATUS schannel_session_info(struct gensec_security *gensec_security,
 				      TALLOC_CTX *mem_ctx,
 				      struct auth_session_info **_session_info)
 {
-	struct schannel_state *state = talloc_get_type(gensec_security->private_data, struct schannel_state);
 	return auth_anonymous_session_info(mem_ctx, gensec_security->settings->lp_ctx, _session_info);
 }
 
diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c
index 9f9e058..1f28147 100644
--- a/source4/auth/ntlmssp/ntlmssp_server.c
+++ b/source4/auth/ntlmssp/ntlmssp_server.c
@@ -220,7 +220,6 @@ NTSTATUS gensec_ntlmssp_session_info(struct gensec_security *gensec_security,
 	struct gensec_ntlmssp_context *gensec_ntlmssp =
 		talloc_get_type_abort(gensec_security->private_data,
 				      struct gensec_ntlmssp_context);
-	struct ntlmssp_state *ntlmssp_state = gensec_ntlmssp->ntlmssp_state;
 
 	nt_status = gensec_generate_session_info(mem_ctx,
 						 gensec_security,
diff --git a/source4/libcli/smb_composite/sesssetup.c b/source4/libcli/smb_composite/sesssetup.c
index 9023ef9..7385669 100644
--- a/source4/libcli/smb_composite/sesssetup.c
+++ b/source4/libcli/smb_composite/sesssetup.c
@@ -82,7 +82,6 @@ static void request_handler(struct smbcli_request *req)
 	struct composite_context *c = (struct composite_context *)req->async.private_data;
 	struct sesssetup_state *state = talloc_get_type(c->private_data, struct sesssetup_state);
 	struct smbcli_session *session = req->session;
-	DATA_BLOB session_key = data_blob(NULL, 0);
 	DATA_BLOB null_data_blob = data_blob(NULL, 0);
 	NTSTATUS session_key_err, nt_status;
 	struct smbcli_request *check_req = NULL;
diff --git a/source4/libnet/py_net.c b/source4/libnet/py_net.c
index cf2f066..86ee8ca 100644
--- a/source4/libnet/py_net.c
+++ b/source4/libnet/py_net.c
@@ -21,7 +21,6 @@
 
 #include <Python.h>
 #include "includes.h"
-#include <ldb.h>
 #include <pyldb.h>
 #include "libnet.h"
 #include "auth/credentials/pycredentials.h"
@@ -30,9 +29,9 @@
 #include "param/pyparam.h"
 #include "auth/gensec/gensec.h"
 #include "librpc/rpc/pyrpc_util.h"
-#include "libcli/finddc.h"
 #include "libcli/resolve/resolve.h"
-#include "dsdb/common/proto.h"
+#include "libcli/finddc.h"
+#include "dsdb/samdb/samdb.h"
 
 void initnet(void);
 
diff --git a/source4/ntvfs/common/brlock.c b/source4/ntvfs/common/brlock.c
index a6232f8..d99cc4e 100644
--- a/source4/ntvfs/common/brlock.c
+++ b/source4/ntvfs/common/brlock.c
@@ -26,7 +26,6 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "tdb_compat.h"
 #include "messaging/messaging.h"
 #include "lib/messaging/irpc.h"
 #include "libcli/libcli.h"


-- 
Samba Shared Repository