From 37d53832a4623653f706e77985a79d84bd7c6694 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 28 Sep 2007 01:17:46 +0000
Subject: r25398: Parse loadparm context to all lp_*() functions. (This used to
 be commit 3fcc960839c6e5ca4de2c3c042f12f369ac5f238)

---
 source4/kdc/kdc.c      | 6 +++---
 source4/kdc/kpasswdd.c | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'source4/kdc')

diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index b3d5ccdb5e..04540e3ef1 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -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(), 
-					lp_kpasswd_port());
+		status = kdc_add_socket(kdc, address, lp_krb5_port(global_loadparm), 
+					lp_kpasswd_port(global_loadparm));
 		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()) {
+	switch (lp_server_role(global_loadparm)) {
 	case ROLE_STANDALONE:
 		task_server_terminate(task, "kdc: no KDC required in standalone configuration");
 		return;
diff --git a/source4/kdc/kpasswdd.c b/source4/kdc/kpasswdd.c
index 7c26675713..b4608c5983 100644
--- a/source4/kdc/kpasswdd.c
+++ b/source4/kdc/kpasswdd.c
@@ -38,6 +38,7 @@
 #include "rpc_server/dcerpc_server.h"
 #include "rpc_server/samr/proto.h"
 #include "libcli/security/security.h"
+#include "param/param.h"
 
 /* hold information about one kdc socket */
 struct kpasswd_socket {
@@ -472,7 +473,7 @@ BOOL kpasswdd_process(struct kdc_server *kdc,
 	/* We want the credentials subsystem to use the krb5 context
 	 * we already have, rather than a new context */	
 	cli_credentials_set_krb5_context(server_credentials, kdc->smb_krb5_context);
-	cli_credentials_set_conf(server_credentials);
+	cli_credentials_set_conf(server_credentials, global_loadparm);
 	nt_status = cli_credentials_set_stored_principal(server_credentials, "kadmin/changepw");
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		ret = kpasswdd_make_unauth_error_reply(kdc, mem_ctx, 
-- 
cgit