Changeset 740 for vendor/current/source4/client/cifsddio.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source4/client/cifsddio.c (modified) (7 diffs)

vendor/current/source4/client/cifsddio.c

@@ -21 +21 @@
 #include "includes.h"
 #include "system/filesys.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 #include "lib/cmdline/popt_common.h"
@@ -229 +228 @@
                                               struct smbcli_options *options,
                                               struct smbcli_session_options *session_options,
-                                              struct smb_iconv_convenience *iconv_convenience,
                                               struct gensec_settings *gensec_settings)
 {
@@ -244 +242 @@
                                      ev, options,
                                      session_options,
-                                     iconv_convenience,
                                      gensec_settings);
 
@@ -314 +311 @@
                                         struct smbcli_options *smb_options,
                                         struct smbcli_session_options *smb_session_options,
-                                        struct smb_iconv_convenience *iconv_convenience,
                                         struct gensec_settings *gensec_settings)
 {
@@ -338 +334 @@
                                           socket_options,
                                           smb_options, smb_session_options,
-                                          iconv_convenience,
                                           gensec_settings)) == NULL) {
                 return(NULL);
@@ -363 +358 @@
                                 struct smbcli_options *smb_options,
                                 struct smbcli_session_options *smb_session_options,
-                                struct smb_iconv_convenience *iconv_convenience,
                                 struct gensec_settings *gensec_settings)
 {
@@ -384 +378 @@
                                                 socket_options, smb_options,
                                                 smb_session_options,
-                                                iconv_convenience,
                                                 gensec_settings));
                 }