summaryrefslogtreecommitdiff
path: root/source4/auth/kerberos
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-01-02 01:52:18 -0600
committerStefan Metzmacher <metze@samba.org>2008-01-01 19:57:01 -0600
commit9d136bc0a323171b13ec047816033ae4fac9e9d4 (patch)
tree426a7e9c243b897cf2464d84c6f4e78f711630a2 /source4/auth/kerberos
parent7d5f0e0893d42b56145a3ffa34e3b4b9906cbd91 (diff)
downloadsamba-9d136bc0a323171b13ec047816033ae4fac9e9d4.tar.gz
samba-9d136bc0a323171b13ec047816033ae4fac9e9d4.tar.bz2
samba-9d136bc0a323171b13ec047816033ae4fac9e9d4.zip
r26640: Janitorial: Remove some more uses of global_loadparm.
(This used to be commit c863f4ebde8efa1a695b4469142d6719e30bc419)
Diffstat (limited to 'source4/auth/kerberos')
-rw-r--r--source4/auth/kerberos/kerberos_pac.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/auth/kerberos/kerberos_pac.c b/source4/auth/kerberos/kerberos_pac.c
index d345ea969a..c46e06bc72 100644
--- a/source4/auth/kerberos/kerberos_pac.c
+++ b/source4/auth/kerberos/kerberos_pac.c
@@ -437,6 +437,7 @@ static krb5_error_code make_pac_checksum(TALLOC_CTX *mem_ctx,
struct PAC_SIGNATURE_DATA *kdc_checksum = NULL;
struct PAC_SIGNATURE_DATA *srv_checksum = NULL;
int i;
+ struct smb_iconv_convenience *iconv_convenience = lp_iconv_convenience(global_loadparm);
/* First, just get the keytypes filled in (and lengths right, eventually) */
for (i=0; i < pac_data->num_buffers; i++) {
@@ -485,7 +486,7 @@ static krb5_error_code make_pac_checksum(TALLOC_CTX *mem_ctx,
memset(srv_checksum->signature.data, '\0', srv_checksum->signature.length);
ndr_err = ndr_push_struct_blob(&tmp_blob, mem_ctx,
- lp_iconv_convenience(global_loadparm),
+ iconv_convenience,
pac_data,
(ndr_push_flags_fn_t)ndr_push_PAC_DATA);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -510,7 +511,7 @@ static krb5_error_code make_pac_checksum(TALLOC_CTX *mem_ctx,
/* And push it out again, this time to the world. This relies on determanistic pointer values */
ndr_err = ndr_push_struct_blob(&tmp_blob, mem_ctx,
- lp_iconv_convenience(global_loadparm),
+ iconv_convenience,
pac_data,
(ndr_push_flags_fn_t)ndr_push_PAC_DATA);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {