diff options
| author | Luk Claes <luk@debian.org> | 2012-05-26 12:14:51 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-05-28 16:58:03 +0200 |
| commit | 4688107800216a86646bc4838f7a485bae091370 (patch) | |
| tree | 7af92e5426374f5a966436092462cc541bf54c5b /source3/torture/scanner.c | |
| parent | 93ed99d6ffb948e9ddde9ddc7280b33fc86adc75 (diff) | |
| download | samba-4688107800216a86646bc4838f7a485bae091370.tar.gz samba-4688107800216a86646bc4838f7a485bae091370.tar.bz2 samba-4688107800216a86646bc4838f7a485bae091370.zip | |
s3:libsmb: get rid of cli_ucs2
Signed-off-by: Luk Claes <luk@debian.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Mon May 28 16:58:03 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/torture/scanner.c')
| -rw-r--r-- | source3/torture/scanner.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c index 01d1456b53..f4c69c1f2b 100644 --- a/source3/torture/scanner.c +++ b/source3/torture/scanner.c @@ -21,6 +21,7 @@ #include "system/filesys.h" #include "torture/proto.h" #include "libsmb/libsmb.h" +#include "../libcli/smb/smbXcli_base.h" #define VERBOSE 0 #define OP_MIN 0 @@ -179,7 +180,7 @@ static bool scan_trans2(struct cli_state *cli, int op, int level, SSVAL(param, 0, level); SSVAL(param, 2, 0); SSVAL(param, 4, 0); - param = trans2_bytes_push_str(param, cli_ucs2(cli), + param = trans2_bytes_push_str(param, smbXcli_conn_use_unicode(cli->conn), fname, strlen(fname)+1, NULL); if (param == NULL) return True; @@ -197,7 +198,7 @@ static bool scan_trans2(struct cli_state *cli, int op, int level, SSVAL(param, 0, level); SSVAL(param, 2, 0); SSVAL(param, 4, 0); - param = trans2_bytes_push_str(param, cli_ucs2(cli), + param = trans2_bytes_push_str(param, smbXcli_conn_use_unicode(cli->conn), newfname, strlen(newfname)+1, NULL); if (param == NULL) return True; @@ -216,7 +217,7 @@ static bool scan_trans2(struct cli_state *cli, int op, int level, if (param == NULL) return True; SSVAL(param, 0, level); - param = trans2_bytes_push_str(param, cli_ucs2(cli), + param = trans2_bytes_push_str(param, smbXcli_conn_use_unicode(cli->conn), dname, strlen(dname)+1, NULL); if (param == NULL) return True; @@ -424,7 +425,7 @@ static bool scan_nttrans(struct cli_state *cli, int op, int level, SSVAL(param, 0, level); SSVAL(param, 2, 0); SSVAL(param, 4, 0); - param = trans2_bytes_push_str(param, cli_ucs2(cli), + param = trans2_bytes_push_str(param, smbXcli_conn_use_unicode(cli->conn), fname, strlen(fname)+1, NULL); if (param == NULL) return True; @@ -442,7 +443,7 @@ static bool scan_nttrans(struct cli_state *cli, int op, int level, SSVAL(param, 0, level); SSVAL(param, 2, 0); SSVAL(param, 4, 0); - param = trans2_bytes_push_str(param, cli_ucs2(cli), + param = trans2_bytes_push_str(param, smbXcli_conn_use_unicode(cli->conn), newfname, strlen(newfname)+1, NULL); if (param == NULL) return True; @@ -461,7 +462,7 @@ static bool scan_nttrans(struct cli_state *cli, int op, int level, if (param == NULL) return True; SSVAL(param, 0, level); - param = trans2_bytes_push_str(param, cli_ucs2(cli), + param = trans2_bytes_push_str(param, smbXcli_conn_use_unicode(cli->conn), dname, strlen(dname)+1, NULL); if (param == NULL) return True; |