s4:rpc_server/lsa: pass the correct variable to setInfoTrustedDomain_base()

[obnox/samba/samba-obnox.git] / source4 / client / cifsddio.c

diff --git a/source4/client/cifsddio.c b/source4/client/cifsddio.c
index 06631ee3acc4d4b24f626211a48723299302e67e..0ceb69e3b15ed7a232b0f998aeec65e041e1673d 100644 (file)
--- a/source4/client/cifsddio.c
+++ b/source4/client/cifsddio.c
@@ -20,7 +20,6 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 #include "lib/cmdline/popt_common.h"
 
@@ -221,14 +220,13 @@ static bool smb_write_func(void * handle, uint8_t * buf, uint64_t wanted,
 }
 
 static struct smbcli_state * init_smb_session(struct resolve_context *resolve_ctx,
-                                             struct event_context *ev,
+                                             struct tevent_context *ev,
                                              const char * host,
                                              const char **ports,
                                              const char * share,
                                              const char *socket_options,
                                              struct smbcli_options *options,
                                              struct smbcli_session_options *session_options,
-                                             struct smb_iconv_convenience *iconv_convenience,
                                              struct gensec_settings *gensec_settings)
 {
        NTSTATUS                ret;
@@ -243,7 +241,6 @@ static struct smbcli_state * init_smb_session(struct resolve_context *resolve_ct
                                     cmdline_credentials, resolve_ctx,
                                     ev, options,
                                     session_options,
-                                    iconv_convenience,
                                     gensec_settings);
 
        if (!NT_STATUS_IS_OK(ret)) {
@@ -303,7 +300,7 @@ static int open_smb_file(struct smbcli_state * cli,
 }
 
 static struct dd_iohandle * open_cifs_handle(struct resolve_context *resolve_ctx,
-                                            struct event_context *ev,
+                                            struct tevent_context *ev,
                                             const char * host,
                                        const char **ports,
                                        const char * share,
@@ -313,7 +310,6 @@ static struct dd_iohandle * open_cifs_handle(struct resolve_context *resolve_ctx
                                        const char *socket_options,
                                        struct smbcli_options *smb_options,
                                        struct smbcli_session_options *smb_session_options,
-                                       struct smb_iconv_convenience *iconv_convenience,
                                        struct gensec_settings *gensec_settings)
 {
        struct cifs_handle * smbh;
@@ -337,7 +333,6 @@ static struct dd_iohandle * open_cifs_handle(struct resolve_context *resolve_ctx
        if ((smbh->cli = init_smb_session(resolve_ctx, ev, host, ports, share,
                                          socket_options,
                                          smb_options, smb_session_options,
-                                         iconv_convenience,
                                          gensec_settings)) == NULL) {
                return(NULL);
        }
@@ -354,7 +349,7 @@ static struct dd_iohandle * open_cifs_handle(struct resolve_context *resolve_ctx
 /* ------------------------------------------------------------------------- */
 
 struct dd_iohandle * dd_open_path(struct resolve_context *resolve_ctx, 
-                                 struct event_context *ev,
+                                 struct tevent_context *ev,
                                  const char * path,
                                  const char **ports,
                                uint64_t io_size,
@@ -362,7 +357,6 @@ struct dd_iohandle * dd_open_path(struct resolve_context *resolve_ctx,
                                const char *socket_options,
                                struct smbcli_options *smb_options,
                                struct smbcli_session_options *smb_session_options,
-                               struct smb_iconv_convenience *iconv_convenience,
                                struct gensec_settings *gensec_settings)
 {
        if (file_exist(path)) {
@@ -383,7 +377,6 @@ struct dd_iohandle * dd_open_path(struct resolve_context *resolve_ctx,
                                                io_size, options, 
                                                socket_options, smb_options,
                                                smb_session_options,
-                                               iconv_convenience,
                                                gensec_settings));
                }