r26640: Janitorial: Remove some more uses of global_loadparm.

[metze/old/samba4-sync/samba4-sync.git/.git] / source / auth / kerberos / kerberos_pac.c

diff --git a/source/auth/kerberos/kerberos_pac.c b/source/auth/kerberos/kerberos_pac.c
index d345ea969a346bb071b58e4876d2836775a8ac53..c46e06bc72aeb34a621d5e6909bb4b8b6b6ac76e 100644 (file)
--- a/source/auth/kerberos/kerberos_pac.c
+++ b/source/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)) {