diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 15:21:45 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-21 15:21:45 +0100 |
| commit | d9f8232c34a695df04a5240e270dd7ffc3101c0e (patch) | |
| tree | 292590769a70bed4722ed677df74569e71f5b355 /source4/kdc/hdb-ldb.c | |
| parent | 921b17648456027b6b46a582aa1d13024a5e9a90 (diff) | |
| download | samba-d9f8232c34a695df04a5240e270dd7ffc3101c0e.tar.gz samba-d9f8232c34a695df04a5240e270dd7ffc3101c0e.tar.bz2 samba-d9f8232c34a695df04a5240e270dd7ffc3101c0e.zip | |
Remove more uses of global_loadparm.
(This used to be commit 230355d2e6e27918dff40823eb238904c7a1870e)
Diffstat (limited to 'source4/kdc/hdb-ldb.c')
| -rw-r--r-- | source4/kdc/hdb-ldb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/kdc/hdb-ldb.c b/source4/kdc/hdb-ldb.c index d8877655c9..2143d26cde 100644 --- a/source4/kdc/hdb-ldb.c +++ b/source4/kdc/hdb-ldb.c @@ -430,6 +430,7 @@ static krb5_error_code LDB_message2entry(krb5_context context, HDB *db, } private->entry_ex = entry_ex; + private->iconv_convenience = lp_iconv_convenience(lp_ctx); talloc_set_destructor(private, hdb_ldb_destrutor); @@ -546,7 +547,7 @@ static krb5_error_code LDB_message2entry(krb5_context context, HDB *db, entry_ex->entry.generation = NULL; /* Get keys from the db */ - ret = LDB_message2entry_keys(context, lp_iconv_convenience(lp_ctx), private, msg, userAccountControl, entry_ex); + ret = LDB_message2entry_keys(context, private->iconv_convenience, private, msg, userAccountControl, entry_ex); if (ret) { /* Could be bougus data in the entry, or out of memory */ goto out; |