Changeset 988 for vendor/current/source4/client/cifsdd.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source4/client/cifsdd.c (modified) (9 diffs)

vendor/current/source4/client/cifsdd.c

@@ -153 +153 @@
                         break;
                 case ARG_SIZE:
-                        if (!conv_str_size(val, &arg->arg_val.nval)) {
+                        if (!conv_str_size_error(val, &arg->arg_val.nval)) {
                                 goto fail;
                         }
@@ -449 +449 @@
                                 &session_options, 
                                 lpcfg_gensec_settings(lp_ctx, lp_ctx)))) {
+                SAFE_FREE(iobuf);
                 return(FILESYS_EXIT_CODE);
         }
@@ -457 +458 @@
                                 &session_options,
                                 lpcfg_gensec_settings(lp_ctx, lp_ctx)))) {
+                SAFE_FREE(iobuf);
                 return(FILESYS_EXIT_CODE);
         }
@@ -488 +490 @@
                                 if (!dd_flush_block(ofile, iobuf,
                                                         &data_size, obs)) {
+                                        SAFE_FREE(iobuf);
                                         return(IOERROR_EXIT_CODE);
                                 }
@@ -498 +501 @@
                  */
                 if (!dd_fill_block(ifile, iobuf, &data_size, obs, ibs)) {
+                        SAFE_FREE(iobuf);
                         return(IOERROR_EXIT_CODE);
                 }
@@ -521 +525 @@
                 if (data_size && 
                     !dd_flush_block(ofile, iobuf, &data_size, obs)) {
+                        SAFE_FREE(iobuf);
                         return(IOERROR_EXIT_CODE);
                 }
@@ -526 +531 @@
 
 done:
+        SAFE_FREE(iobuf);
         print_transfer_stats();
         return(0);
@@ -566 +572 @@
         set_arg_val("count", (uint64_t)-1);
         set_arg_val("seek", (uint64_t)0);
-        set_arg_val("seek", (uint64_t)0);
+        set_arg_val("skip", (uint64_t)0);
         /* Files. */
         set_arg_val("if", NULL);
@@ -598 +604 @@
         ev = s4_event_context_init(talloc_autofree_context());
 
-        gensec_init(cmdline_lp_ctx);
+        gensec_init();
         dump_args();