summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-04-19 15:43:33 +1000
committerAndrew Bartlett <abartlet@samba.org>2010-05-20 17:39:10 +1000
commit3ff2766231625863140434bab18b27d5105deb3c (patch)
treea6274abe24899169c369eb2e4902f6bbf4f007cb
parentfeb9ffdac82c0e30ea61b7ac0d3dae2fcd3bcedd (diff)
downloadsamba-3ff2766231625863140434bab18b27d5105deb3c.tar.gz
samba-3ff2766231625863140434bab18b27d5105deb3c.tar.bz2
samba-3ff2766231625863140434bab18b27d5105deb3c.zip
s4:auth Push check for messaging context into winbind backend
If we don't use the winbind backend, we don't (for now) need a messaging context- and we don't have one in LDB at the moment. Andrew Bartlett
-rw-r--r--source4/auth/ntlm/auth.c5
-rw-r--r--source4/auth/ntlm/auth_winbind.c5
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/auth/ntlm/auth.c b/source4/auth/ntlm/auth.c
index 3f1ee669c9..a9c3262f07 100644
--- a/source4/auth/ntlm/auth.c
+++ b/source4/auth/ntlm/auth.c
@@ -426,11 +426,6 @@ _PUBLIC_ NTSTATUS auth_context_create_methods(TALLOC_CTX *mem_ctx, const char **
return NT_STATUS_INTERNAL_ERROR;
}
- if (!msg) {
- DEBUG(0,("auth_context_create: called with out messaging context\n"));
- return NT_STATUS_INTERNAL_ERROR;
- }
-
ctx = talloc(mem_ctx, struct auth_context);
NT_STATUS_HAVE_NO_MEMORY(ctx);
ctx->challenge.set_by = NULL;
diff --git a/source4/auth/ntlm/auth_winbind.c b/source4/auth/ntlm/auth_winbind.c
index 7406a94275..51a1f4d41f 100644
--- a/source4/auth/ntlm/auth_winbind.c
+++ b/source4/auth/ntlm/auth_winbind.c
@@ -240,6 +240,11 @@ static NTSTATUS winbind_check_password(struct auth_method_context *ctx,
const struct auth_usersupplied_info *user_info_new;
struct netr_IdentityInfo *identity_info;
+ if (!ctx->auth_ctx->msg_ctx) {
+ DEBUG(0,("winbind_check_password: auth_context_create was called with out messaging context\n"));
+ return NT_STATUS_INTERNAL_ERROR;
+ }
+
s = talloc(mem_ctx, struct winbind_check_password_state);
NT_STATUS_HAVE_NO_MEMORY(s);