summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-01-09 19:44:13 +0100
committerVolker Lendecke <vl@samba.org>2011-01-17 08:03:40 +0100
commit674dcd68a635c183a7cafb9547d2b2f1b0a24081 (patch)
tree8b402a652823ad8076efd1dee291b86e985e4e6c
parentfc8bfeea31528b2842fdde22203d576fab8adb92 (diff)
downloadsamba-674dcd68a635c183a7cafb9547d2b2f1b0a24081.tar.gz
samba-674dcd68a635c183a7cafb9547d2b2f1b0a24081.tar.bz2
samba-674dcd68a635c183a7cafb9547d2b2f1b0a24081.zip
s3: Remove cli_send_trans from cli_qpathinfo_alt_name
-rw-r--r--source3/libsmb/clirap.c76
1 files changed, 25 insertions, 51 deletions
diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c
index c6b8cfb1cc..9c87f04d02 100644
--- a/source3/libsmb/clirap.c
+++ b/source3/libsmb/clirap.c
@@ -1275,67 +1275,41 @@ NTSTATUS cli_qpathinfo_basic(struct cli_state *cli, const char *name,
NTSTATUS cli_qpathinfo_alt_name(struct cli_state *cli, const char *fname, fstring alt_name)
{
- unsigned int data_len = 0;
- unsigned int param_len = 0;
- uint16 setup = TRANSACT2_QPATHINFO;
- char *param;
- char *rparam=NULL, *rdata=NULL;
- int count=8;
- char *p;
- bool ret;
+ uint8_t *rdata;
+ uint32_t num_rdata;
unsigned int len;
- size_t nlen = 2*(strlen(fname)+1);
-
- param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
- if (!param) {
- return NT_STATUS_NO_MEMORY;
- }
- p = param;
- memset(param, '\0', 6);
- SSVAL(p, 0, SMB_QUERY_FILE_ALT_NAME_INFO);
- p += 6;
- p += clistr_push(cli, p, fname, nlen, STR_TERMINATE);
- param_len = PTR_DIFF(p, param);
-
- do {
- ret = (cli_send_trans(cli, SMBtrans2,
- NULL, /* Name */
- -1, 0, /* fid, flags */
- &setup, 1, 0, /* setup, length, max */
- param, param_len, 10, /* param, length, max */
- NULL, data_len, cli->max_xmit /* data, length, max */
- ) &&
- cli_receive_trans(cli, SMBtrans2,
- &rparam, &param_len,
- &rdata, &data_len));
- if (!ret && cli_is_dos_error(cli)) {
- /* we need to work around a Win95 bug - sometimes
- it gives ERRSRV/ERRerror temprarily */
- uint8 eclass;
- uint32 ecode;
- cli_dos_error(cli, &eclass, &ecode);
- if (eclass != ERRSRV || ecode != ERRerror) break;
- smb_msleep(100);
- }
- } while (count-- && ret==False);
-
- SAFE_FREE(param);
+ char *converted = NULL;
+ size_t converted_size = 0;
+ NTSTATUS status;
- if (!ret || !rdata || data_len < 4) {
- return NT_STATUS_UNSUCCESSFUL;
+ status = cli_qpathinfo(talloc_tos(), cli, fname,
+ SMB_QUERY_FILE_ALT_NAME_INFO,
+ 4, cli->max_xmit, &rdata, &num_rdata);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
}
len = IVAL(rdata, 0);
- if (len > data_len - 4) {
+ if (len > num_rdata - 4) {
return NT_STATUS_INVALID_NETWORK_RESPONSE;
}
- clistr_pull(cli->inbuf, alt_name, rdata+4, sizeof(fstring), len,
- STR_UNICODE);
+ /* The returned data is a pushed string, not raw data. */
+ if (!convert_string_talloc(talloc_tos(),
+ cli_ucs2(cli) ? CH_UTF16LE : CH_DOS,
+ CH_UNIX,
+ rdata + 4,
+ len,
+ &converted,
+ &converted_size,
+ true)) {
+ return NT_STATUS_NO_MEMORY;
+ }
+ fstrcpy(alt_name, converted);
- SAFE_FREE(rdata);
- SAFE_FREE(rparam);
+ TALLOC_FREE(converted);
+ TALLOC_FREE(rdata);
return NT_STATUS_OK;
}