Changeset 740 for vendor/current/source4/client/cifsdd.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/cifsdd.c (modified) (6 diffs)

vendor/current/source4/client/cifsdd.c

@@ -61 +61 @@
 /* ------------------------------------------------------------------------- */
 
+static const struct {
+        enum argtype arg_type;
+        const char * arg_name;
+} names [] = {
+        { ARG_NUMERIC, "COUNT" },
+        { ARG_SIZE, "SIZE" },
+        { ARG_PATHNAME, "FILE" },
+        { ARG_BOOL, "BOOLEAN" },
+};
+
 static const char * argtype_str(enum argtype arg_type)
 {
-        static const struct {
-                enum argtype arg_type;
-                const char * arg_name;
-        } names [] = 
-        {
-                { ARG_NUMERIC, "COUNT" },
-                { ARG_SIZE, "SIZE" },
-                { ARG_PATHNAME, "FILE" },
-                { ARG_BOOL, "BOOLEAN" },
-        };
-
         int i;
 
@@ -361 +360 @@
                                       const char *socket_options,
                                       struct smbcli_session_options *smb_session_options,
-                                      struct smb_iconv_convenience *iconv_convenience,
                                       struct gensec_settings *gensec_settings)
 {
@@ -386 +384 @@
                                       socket_options,
                                       smb_options, smb_session_options,
-                                      iconv_convenience,
                                       gensec_settings);
         } else if (strcmp(which, "of") == 0) {
@@ -395 +392 @@
                                       socket_options,
                                       smb_options, smb_session_options,
-                                      iconv_convenience,
                                       gensec_settings);
         } else {
@@ -429 +425 @@
         count = check_arg_numeric("count");
 
-        lp_smbcli_options(lp_ctx, &options);
-        lp_smbcli_session_options(lp_ctx, &session_options);
+        lpcfg_smbcli_options(lp_ctx, &options);
+        lpcfg_smbcli_session_options(lp_ctx, &session_options);
 
         /* Allocate IO buffer. We need more than the max IO size because we
@@ -448 +444 @@
                         (unsigned long long)iomax, options.max_xmit));
 
-        if (!(ifile = open_file(lp_resolve_context(lp_ctx), ev, "if",
-                                lp_smb_ports(lp_ctx), &options,
-                                lp_socket_options(lp_ctx),
-                                &session_options, lp_iconv_convenience(lp_ctx),
-                                lp_gensec_settings(lp_ctx, lp_ctx)))) {
+        if (!(ifile = open_file(lpcfg_resolve_context(lp_ctx), ev, "if",
+                                lpcfg_smb_ports(lp_ctx), &options,
+                                lpcfg_socket_options(lp_ctx),
+                                &session_options, 
+                                lpcfg_gensec_settings(lp_ctx, lp_ctx)))) {
                 return(FILESYS_EXIT_CODE);
         }
 
-        if (!(ofile = open_file(lp_resolve_context(lp_ctx), ev, "of",
-                                lp_smb_ports(lp_ctx), &options,
-                                lp_socket_options(lp_ctx),
+        if (!(ofile = open_file(lpcfg_resolve_context(lp_ctx), ev, "of",
+                                lpcfg_smb_ports(lp_ctx), &options,
+                                lpcfg_socket_options(lp_ctx),
                                 &session_options,
-                                lp_iconv_convenience(lp_ctx),
-                                lp_gensec_settings(lp_ctx, lp_ctx)))) {
+                                lpcfg_gensec_settings(lp_ctx, lp_ctx)))) {
                 return(FILESYS_EXIT_CODE);
         }