From: Volker Lendecke <vl@samba.org>
Date: Thu, 19 Apr 2012 06:24:27 +0000 (+0200)
Subject: s3: Fix a "ISO C90 forbids mixed declarations and code"
X-Git-Tag: samba-4.0.0alpha20~195
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ce9389b292dfee7d6c82681a78ef93eeef9b443;p=thirdparty%2Fsamba.git

s3: Fix a "ISO C90 forbids mixed declarations and code"

Autobuild-User: Volker Lendecke <vl@samba.org>
Autobuild-Date: Thu Apr 19 10:32:27 CEST 2012 on sn-devel-104
---

diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index ab629d2ccc6..84457f6e521 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;