Changeset 740 for vendor/current/source4/torture/basic/charset.c

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source4/torture/basic/charset.c (modified) (4 diffs)

vendor/current/source4/torture/basic/charset.c ¶

@@ -21 +21 @@
 
 #include "includes.h"
-#include "torture/torture.h"
-#include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
@@ -57 +55 @@
         SSVAL(ucs_name, i*2, 0);
 
-        if (!convert_string_talloc_convenience(ucs_name, lp_iconv_convenience(tctx->lp_ctx), CH_UTF16, CH_UNIX, ucs_name, (1+u_name_len)*2, (void **)&fname, &i, false)) {
+        if (!convert_string_talloc_convenience(ucs_name, lpcfg_iconv_convenience(tctx->lp_ctx), CH_UTF16, CH_UNIX, ucs_name, (1+u_name_len)*2, (void **)&fname, &i, false)) {
                 torture_comment(tctx, "Failed to convert UCS2 Name into unix - convert_string_talloc() failure\n");
                 talloc_free(ucs_name);
@@ -71 +69 @@
         io.generic.level = RAW_OPEN_NTCREATEX;
         io.ntcreatex.in.flags = NTCREATEX_FLAGS_EXTENDED;
-        io.ntcreatex.in.root_fid = 0;
+        io.ntcreatex.in.root_fid.fnum = 0;
         io.ntcreatex.in.access_mask = SEC_RIGHTS_FILE_ALL;
         io.ntcreatex.in.alloc_size = 0;
@@ -200 +198 @@
 struct torture_suite *torture_charset(TALLOC_CTX *mem_ctx)
 {
-        struct torture_suite *suite = torture_suite_create(mem_ctx, "CHARSET");
+        struct torture_suite *suite = torture_suite_create(mem_ctx, "charset");
 
         torture_suite_add_1smb_test(suite, "Testing composite character (a umlaut)", test_composed);