diff options
| author | Ralph Boehme <rb@sernet.de> | 2014-10-01 14:36:43 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-12-04 22:11:08 +0100 |
| commit | b942d6b05f5eacfe33631534f559ab8b99369347 (patch) | |
| tree | 561731cd2f9e32c28d222b58143820ef7562f290 /source4 | |
| parent | 2236883cdeadab02f0ed367e13b41a32b1f85c34 (diff) | |
| download | samba-b942d6b05f5eacfe33631534f559ab8b99369347.tar.gz | |
s4:libcli/raw: make short_name available in buffer
This will be used in smb2/create AAPL context torture tests, where the
server returns an Mac OS X specific data blob in the short name
buffer. It's not a string, so the existing string extraction doesn't
cut it.
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/libcli/raw/interfaces.h | 1 | ||||
| -rw-r--r-- | source4/libcli/raw/rawsearch.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h index dd0c3bd90ae..5804a6beff9 100644 --- a/source4/libcli/raw/interfaces.h +++ b/source4/libcli/raw/interfaces.h @@ -2740,6 +2740,7 @@ union smb_search_data { uint32_t attrib; uint32_t ea_size; uint64_t file_id; + uint8_t short_name_buf[24]; struct smb_wire_string short_name; struct smb_wire_string name; } id_both_directory_info; diff --git a/source4/libcli/raw/rawsearch.c b/source4/libcli/raw/rawsearch.c index 0705faa4e3e..6035cc244e0 100644 --- a/source4/libcli/raw/rawsearch.c +++ b/source4/libcli/raw/rawsearch.c @@ -456,6 +456,7 @@ NTSTATUS smb_raw_search_common(TALLOC_CTX *mem_ctx, smbcli_blob_pull_string(NULL, mem_ctx, blob, &data->id_both_directory_info.short_name, 68, 70, STR_LEN8BIT | STR_UNICODE); + memcpy(data->id_both_directory_info.short_name_buf, blob->data + 70, 24); data->id_both_directory_info.file_id = BVAL(blob->data, 96); len = smbcli_blob_pull_string(NULL, mem_ctx, blob, &data->id_both_directory_info.name, |