[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  9ce9389 s3: Fix a "ISO C90 forbids mixed declarations and code"
      from  7ca706d dbcheck: Add a check that every FSMO role has a valid owner

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


- Log -----------------------------------------------------------------
commit 9ce9389b292dfee7d6c82681a78ef93eeef9b443
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Apr 19 08:24:27 2012 +0200

    s3: Fix a "ISO C90 forbids mixed declarations and code"
    
    Autobuild-User: Volker Lendecke <vl at samba.org>
    Autobuild-Date: Thu Apr 19 10:32:27 CEST 2012 on sn-devel-104

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

Summary of changes:
 source3/utils/ntlm_auth.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index ab629d2..84457f6 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -1068,14 +1068,18 @@ static NTSTATUS ntlm_auth_start_ntlmssp_server(TALLOC_CTX *mem_ctx,
 	struct gensec_security *gensec_security;
 	NTSTATUS nt_status;
 
-	TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
-	NT_STATUS_HAVE_NO_MEMORY(tmp_ctx);
+	TALLOC_CTX *tmp_ctx;
 
 	struct gensec_settings *gensec_settings;
 	size_t idx = 0;
 	struct cli_credentials *server_credentials;
 	
-	struct auth4_context *auth4_context = make_auth4_context_ntlm_auth(tmp_ctx, opt_password);
+	struct auth4_context *auth4_context;
+
+	tmp_ctx = talloc_new(mem_ctx);
+	NT_STATUS_HAVE_NO_MEMORY(tmp_ctx);
+
+	auth4_context = make_auth4_context_ntlm_auth(tmp_ctx, opt_password);
 	if (auth4_context == NULL) {
 		TALLOC_FREE(tmp_ctx);
 		return NT_STATUS_NO_MEMORY;


-- 
Samba Shared Repository