diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-02 17:09:52 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:04 +0100 |
| commit | f4a1083cf9f64b4d2b65b68942e93861409ea90f (patch) | |
| tree | f5e03ad4edfa14eaf09d9d781825a6a30b67b5a9 /source4/auth | |
| parent | 2fa338cdc99276a5f85ad54cb88b372ffe8ab063 (diff) | |
| download | samba-f4a1083cf9f64b4d2b65b68942e93861409ea90f.tar.gz samba-f4a1083cf9f64b4d2b65b68942e93861409ea90f.tar.bz2 samba-f4a1083cf9f64b4d2b65b68942e93861409ea90f.zip | |
r26227: Make loadparm_context part of a server task, move loadparm_contexts further up the call stack.
(This used to be commit 0721a07aada6a1fae6dcbd610b8783df57d7bbad)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/auth_sam.c | 4 | ||||
| -rw-r--r-- | source4/auth/sam.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c index c1fcaa6f72..42e5ae9e7e 100644 --- a/source4/auth/auth_sam.c +++ b/source4/auth/auth_sam.c @@ -22,8 +22,8 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_netlogon.h" #include "system/time.h" -#include "util/util_ldb.h" #include "lib/ldb/include/ldb.h" +#include "util/util_ldb.h" #include "auth/auth.h" #include "auth/auth_sam.h" #include "dsdb/samdb/samdb.h" @@ -283,7 +283,7 @@ static NTSTATUS authsam_check_password_internals(struct auth_method_context *ctx return NT_STATUS_NO_MEMORY; } - sam_ctx = samdb_connect(tmp_ctx, system_session(mem_ctx)); + sam_ctx = samdb_connect(tmp_ctx, global_loadparm, system_session(mem_ctx)); if (sam_ctx == NULL) { talloc_free(tmp_ctx); return NT_STATUS_INVALID_SYSTEM_SERVICE; diff --git a/source4/auth/sam.c b/source4/auth/sam.c index 6a212b8cfe..ce02821e83 100644 --- a/source4/auth/sam.c +++ b/source4/auth/sam.c @@ -439,7 +439,7 @@ NTSTATUS sam_get_server_info_principal(TALLOC_CTX *mem_ctx, const char *principa return NT_STATUS_NO_MEMORY; } - sam_ctx = samdb_connect(tmp_ctx, system_session(tmp_ctx)); + sam_ctx = samdb_connect(tmp_ctx, global_loadparm, system_session(tmp_ctx)); if (sam_ctx == NULL) { talloc_free(tmp_ctx); return NT_STATUS_INVALID_SYSTEM_SERVICE; |