diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-05-10 00:42:06 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-05-18 11:45:31 +0200 |
| commit | b8268cf7b0264ea28f684cbdfbf462e68a018d83 (patch) | |
| tree | 638192f21ae437a5c59ab2ec4500c9ea8c9f7b54 /source4/kdc | |
| parent | f9ca9e46ad24036bf00cb361a6cef4b2e7e98d7d (diff) | |
| download | samba-b8268cf7b0264ea28f684cbdfbf462e68a018d83.tar.gz samba-b8268cf7b0264ea28f684cbdfbf462e68a018d83.tar.bz2 samba-b8268cf7b0264ea28f684cbdfbf462e68a018d83.zip | |
s3: Remove use of iconv_convenience.
Diffstat (limited to 'source4/kdc')
| -rw-r--r-- | source4/kdc/mit_samba.c | 3 | ||||
| -rw-r--r-- | source4/kdc/pac-glue.h | 1 | ||||
| -rw-r--r-- | source4/kdc/samba_kdc.h | 1 | ||||
| -rw-r--r-- | source4/kdc/wdc-samba4.c | 1 |
4 files changed, 0 insertions, 6 deletions
diff --git a/source4/kdc/mit_samba.c b/source4/kdc/mit_samba.c index 328124c409..7718e56d65 100644 --- a/source4/kdc/mit_samba.c +++ b/source4/kdc/mit_samba.c @@ -98,8 +98,6 @@ static int mit_samba_context_init(struct mit_samba_context **_ctx) cli_credentials_set_kerberos_state(ctx->session_info->credentials, CRED_DONT_USE_KERBEROS); - ctx->db_ctx->ic_ctx = lp_iconv_convenience(ctx->db_ctx->lp_ctx); - ctx->db_ctx->samdb = samdb_connect(ctx, ctx->db_ctx->ev_ctx, ctx->db_ctx->lp_ctx, @@ -275,7 +273,6 @@ static int mit_samba_update_pac_data(struct mit_samba_context *ctx, } nt_status = samba_kdc_update_pac_blob(tmp_ctx, ctx->context, - ctx->db_ctx->ic_ctx, &pac, logon_blob); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0, ("Building PAC failed: %s\n", diff --git a/source4/kdc/pac-glue.h b/source4/kdc/pac-glue.h index a1f0b37fdd..4723a72b07 100644 --- a/source4/kdc/pac-glue.h +++ b/source4/kdc/pac-glue.h @@ -33,7 +33,6 @@ NTSTATUS samba_kdc_get_pac_blob(TALLOC_CTX *mem_ctx, NTSTATUS samba_kdc_update_pac_blob(TALLOC_CTX *mem_ctx, krb5_context context, - struct smb_iconv_convenience *ic, krb5_pac *pac, DATA_BLOB *pac_blob); void samba_kdc_build_edata_reply(NTSTATUS nt_status, DATA_BLOB *e_data); diff --git a/source4/kdc/samba_kdc.h b/source4/kdc/samba_kdc.h index fcaf3b9704..bfa868f422 100644 --- a/source4/kdc/samba_kdc.h +++ b/source4/kdc/samba_kdc.h @@ -31,7 +31,6 @@ struct samba_kdc_seq; struct samba_kdc_db_context { struct tevent_context *ev_ctx; struct loadparm_context *lp_ctx; - struct smb_iconv_convenience *ic_ctx; struct ldb_context *samdb; struct samba_kdc_seq *seq_ctx; }; diff --git a/source4/kdc/wdc-samba4.c b/source4/kdc/wdc-samba4.c index ce8f542ee2..0ebc4e7c2b 100644 --- a/source4/kdc/wdc-samba4.c +++ b/source4/kdc/wdc-samba4.c @@ -85,7 +85,6 @@ static krb5_error_code samba_wdc_reget_pac(void *priv, krb5_context context, } nt_status = samba_kdc_update_pac_blob(mem_ctx, context, - p->kdc_db_ctx->ic_ctx, pac, pac_blob); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0, ("Building PAC failed: %s\n", |