diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-02 19:04:33 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:06 +0100 |
| commit | cc04f143dcd35fb67884e385ffd3e6ed2d32a4c2 (patch) | |
| tree | b543f309338aff262df5dba69bb12fdb24b5b825 /source4/kdc | |
| parent | 51db4c3f3d81d1ed03beae6426786c843ac59807 (diff) | |
| download | samba-cc04f143dcd35fb67884e385ffd3e6ed2d32a4c2.tar.gz samba-cc04f143dcd35fb67884e385ffd3e6ed2d32a4c2.tar.bz2 samba-cc04f143dcd35fb67884e385ffd3e6ed2d32a4c2.zip | |
r26229: Set loadparm context as opaque pointer in ldb, remove more uses of global_loadparm.
(This used to be commit 37d05fdc7b0e6b3211ba6ae56b1b5da30a6a392a)
Diffstat (limited to 'source4/kdc')
| -rw-r--r-- | source4/kdc/kdc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c index d1582215f8..b24b58f8d4 100644 --- a/source4/kdc/kdc.c +++ b/source4/kdc/kdc.c @@ -516,7 +516,7 @@ static NTSTATUS kdc_add_socket(struct kdc_server *kdc, const char *address, /* setup our listening sockets on the configured network interfaces */ -static NTSTATUS kdc_startup_interfaces(struct kdc_server *kdc) +static NTSTATUS kdc_startup_interfaces(struct kdc_server *kdc, struct loadparm_context *lp_ctx) { int num_interfaces = iface_count(); TALLOC_CTX *tmp_ctx = talloc_new(kdc); @@ -526,8 +526,8 @@ static NTSTATUS kdc_startup_interfaces(struct kdc_server *kdc) for (i=0; i<num_interfaces; i++) { const char *address = talloc_strdup(tmp_ctx, iface_n_ip(i)); - status = kdc_add_socket(kdc, address, lp_krb5_port(global_loadparm), - lp_kpasswd_port(global_loadparm)); + status = kdc_add_socket(kdc, address, lp_krb5_port(lp_ctx), + lp_kpasswd_port(lp_ctx)); NT_STATUS_NOT_OK_RETURN(status); } @@ -555,7 +555,7 @@ static void kdc_task_init(struct task_server *task) NTSTATUS status; krb5_error_code ret; - switch (lp_server_role(global_loadparm)) { + switch (lp_server_role(task->lp_ctx)) { case ROLE_STANDALONE: task_server_terminate(task, "kdc: no KDC required in standalone configuration"); return; @@ -636,7 +636,7 @@ static void kdc_task_init(struct task_server *task) kdc_mem_ctx = kdc->smb_krb5_context; /* start listening on the configured network interfaces */ - status = kdc_startup_interfaces(kdc); + status = kdc_startup_interfaces(kdc, task->lp_ctx); if (!NT_STATUS_IS_OK(status)) { task_server_terminate(task, "kdc failed to setup interfaces"); return; |