From b8268cf7b0264ea28f684cbdfbf462e68a018d83 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 10 May 2010 00:42:06 +0200
Subject: s3: Remove use of iconv_convenience.

---
 source4/libcli/smb_composite/fetchfile.c     | 1 -
 source4/libcli/smb_composite/fsinfo.c        | 1 -
 source4/libcli/smb_composite/smb_composite.h | 3 ---
 3 files changed, 5 deletions(-)

(limited to 'source4/libcli/smb_composite')

diff --git a/source4/libcli/smb_composite/fetchfile.c b/source4/libcli/smb_composite/fetchfile.c
index 210a2940b9..d19c86a8d0 100644
--- a/source4/libcli/smb_composite/fetchfile.c
+++ b/source4/libcli/smb_composite/fetchfile.c
@@ -146,7 +146,6 @@ struct composite_context *smb_composite_fetchfile_send(struct smb_composite_fetc
 	state->connect->in.fallback_to_anonymous = false;
 	state->connect->in.workgroup    = io->in.workgroup;
 	state->connect->in.gensec_settings = io->in.gensec_settings;
-	state->connect->in.iconv_convenience = io->in.iconv_convenience;
 
 	state->connect->in.options	= io->in.options;
 	state->connect->in.session_options = io->in.session_options;
diff --git a/source4/libcli/smb_composite/fsinfo.c b/source4/libcli/smb_composite/fsinfo.c
index 3bc93b62ab..6537ef8c92 100644
--- a/source4/libcli/smb_composite/fsinfo.c
+++ b/source4/libcli/smb_composite/fsinfo.c
@@ -153,7 +153,6 @@ struct composite_context *smb_composite_fsinfo_send(struct smbcli_tree *tree,
 	state->connect->in.credentials  = io->in.credentials;
 	state->connect->in.fallback_to_anonymous = false;
 	state->connect->in.workgroup    = io->in.workgroup;
-	state->connect->in.iconv_convenience = io->in.iconv_convenience;
 	state->connect->in.gensec_settings = io->in.gensec_settings;
 
 	state->connect->in.options = tree->session->transport->options;
diff --git a/source4/libcli/smb_composite/smb_composite.h b/source4/libcli/smb_composite/smb_composite.h
index a1e1e99d7e..448e05a6ed 100644
--- a/source4/libcli/smb_composite/smb_composite.h
+++ b/source4/libcli/smb_composite/smb_composite.h
@@ -60,7 +60,6 @@ struct smb_composite_fetchfile {
 		struct smbcli_options options;
 		struct smbcli_session_options session_options;
 		struct resolve_context *resolve_ctx;
-		struct smb_iconv_convenience *iconv_convenience;
 		struct gensec_settings *gensec_settings;
 	} in;
 	struct {
@@ -104,7 +103,6 @@ struct smb_composite_connect {
 		const char *workgroup;
 		struct smbcli_options options;
 		struct smbcli_session_options session_options;
-		struct smb_iconv_convenience *iconv_convenience;
 		struct gensec_settings *gensec_settings;
 	} in;
 	struct {
@@ -145,7 +143,6 @@ struct smb_composite_fsinfo {
 		struct cli_credentials *credentials;
 		const char *workgroup;
 		enum smb_fsinfo_level level;
-		struct smb_iconv_convenience *iconv_convenience;
 		struct gensec_settings *gensec_settings;
 	} in;
 	
-- 
cgit