diff options
| author | John H Terpstra <jht@samba.org> | 2009-07-23 09:33:06 -0500 |
|---|---|---|
| committer | John H Terpstra <jht@samba.org> | 2009-07-23 09:33:06 -0500 |
| commit | 94717ae8e5dfe2ccdb7f3557d5490708b00ae471 (patch) | |
| tree | a39f669faf23ad05497963cf5ccf611467d0145b /source3/auth/auth.c | |
| parent | 14952c72a29ec92badb1bcf16d2a15fe100f060d (diff) | |
| parent | 7bad4b48c82fed4263c2bfe97a4d00b47913604a (diff) | |
| download | samba-94717ae8e5dfe2ccdb7f3557d5490708b00ae471.tar.gz samba-94717ae8e5dfe2ccdb7f3557d5490708b00ae471.tar.bz2 samba-94717ae8e5dfe2ccdb7f3557d5490708b00ae471.zip | |
Merge branch 'master' of ssh://jht@git.samba.org/data/git/samba
Diffstat (limited to 'source3/auth/auth.c')
| -rw-r--r-- | source3/auth/auth.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/source3/auth/auth.c b/source3/auth/auth.c index fd4c503752..ce8722a1b4 100644 --- a/source3/auth/auth.c +++ b/source3/auth/auth.c @@ -82,7 +82,6 @@ static void get_ntlm_challenge(struct auth_context *auth_context, DATA_BLOB challenge = data_blob_null; const char *challenge_set_by = NULL; auth_methods *auth_method; - TALLOC_CTX *mem_ctx; if (auth_context->challenge.length) { DEBUG(5, ("get_ntlm_challenge (auth subsystem): returning previous challenge by module %s (normal)\n", @@ -106,12 +105,8 @@ static void get_ntlm_challenge(struct auth_context *auth_context, continue; } - mem_ctx = talloc_init("auth_get_challenge for module %s", auth_method->name); - if (!mem_ctx) { - smb_panic("talloc_init() failed!"); - } - - challenge = auth_method->get_chal(auth_context, &auth_method->private_data, mem_ctx); + challenge = auth_method->get_chal(auth_context, &auth_method->private_data, + auth_context->mem_ctx); if (!challenge.length) { DEBUG(3, ("auth_get_challenge: getting challenge from authentication method %s FAILED.\n", auth_method->name)); @@ -121,7 +116,6 @@ static void get_ntlm_challenge(struct auth_context *auth_context, challenge_set_by = auth_method->name; auth_context->challenge_set_method = auth_method; } - talloc_destroy(mem_ctx); } if (!challenge_set_by) { |