summaryrefslogtreecommitdiff
path: root/source4/nbt_server
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-02 17:09:52 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:47:04 +0100
commitf4a1083cf9f64b4d2b65b68942e93861409ea90f (patch)
treef5e03ad4edfa14eaf09d9d781825a6a30b67b5a9 /source4/nbt_server
parent2fa338cdc99276a5f85ad54cb88b372ffe8ab063 (diff)
downloadsamba-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/nbt_server')
-rw-r--r--source4/nbt_server/dgram/netlogon.c4
-rw-r--r--source4/nbt_server/nbt_server.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index 8672028348..ab6588348f 100644
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -53,7 +53,7 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot,
return;
}
- samctx = samdb_connect(packet, anonymous_session(packet));
+ samctx = samdb_connect(packet, global_loadparm, anonymous_session(packet));
if (samctx == NULL) {
DEBUG(2,("Unable to open sam in getdc reply\n"));
return;
@@ -123,7 +123,7 @@ static void nbtd_netlogon_getdc2(struct dgram_mailslot_handler *dgmslot,
return;
}
- samctx = samdb_connect(packet, anonymous_session(packet));
+ samctx = samdb_connect(packet, global_loadparm, anonymous_session(packet));
if (samctx == NULL) {
DEBUG(2,("Unable to open sam in getdc reply\n"));
return;
diff --git a/source4/nbt_server/nbt_server.c b/source4/nbt_server/nbt_server.c
index abb4593b2c..173cea91d0 100644
--- a/source4/nbt_server/nbt_server.c
+++ b/source4/nbt_server/nbt_server.c
@@ -62,7 +62,7 @@ static void nbtd_task_init(struct task_server *task)
return;
}
- nbtsrv->sam_ctx = samdb_connect(nbtsrv, anonymous_session(nbtsrv));
+ nbtsrv->sam_ctx = samdb_connect(nbtsrv, task->lp_ctx, anonymous_session(nbtsrv));
if (nbtsrv->sam_ctx == NULL) {
task_server_terminate(task, "nbtd failed to open samdb");
return;