summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-04-19 08:24:27 +0200
committerVolker Lendecke <vl@samba.org>2012-04-19 10:32:27 +0200
commit9ce9389b292dfee7d6c82681a78ef93eeef9b443 (patch)
tree178b236aa4030de3118ceeb5196f57ef94b93cbe
parent7ca706de8c9f52ee530dfa4ff9188d2a7403e87d (diff)
downloadsamba-9ce9389b292dfee7d6c82681a78ef93eeef9b443.tar.gz
samba-9ce9389b292dfee7d6c82681a78ef93eeef9b443.tar.bz2
samba-9ce9389b292dfee7d6c82681a78ef93eeef9b443.zip
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
-rw-r--r--source3/utils/ntlm_auth.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index ab629d2ccc..84457f6e52 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;