s4-loadparm: 2nd half of lp_ to lpcfg_ conversion

[gd/samba-autobuild/.git] / source4 / libcli / smb_composite / smb_composite.h

diff --git a/source4/libcli/smb_composite/smb_composite.h b/source4/libcli/smb_composite/smb_composite.h
index a1e1e99d7e9e5bccb6219b6704b91712d882cfe7..84d9e78b911fcd4ed0e4944a89299952fb0758ab 100644 (file)
--- 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;
        
@@ -181,7 +178,7 @@ struct smb_composite_connectmulti {
                int num_dests;
                const char **hostnames;
                const char **addresses;
-               int *ports;     /* Either NULL for lp_smb_ports() per
+               int *ports;     /* Either NULL for lpcfg_smb_ports() per
                                 * destination or a list of explicit ports */
        } in;
        struct {