From af0a9eb52955cfae570bfdc01821f56385c860cf Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 6 Jul 2006 08:00:24 +0000 Subject: r16834: split the level's of smb_search_first/smb_search_next and the levels of smb_search_data metze (This used to be commit 78c201db8a47a71908698c4dda2add4cf85694d9) --- source4/smb_server/blob.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'source4/smb_server/blob.c') diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c index 07d1e0480d..a456e04b34 100644 --- a/source4/smb_server/blob.c +++ b/source4/smb_server/blob.c @@ -593,7 +593,7 @@ NTSTATUS smbsrv_pull_passthru_sfileinfo(TALLOC_CTX *mem_ctx, */ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, - enum smb_search_level level, + enum smb_search_data_level level, union smb_search_data *file, int default_str_flags) { @@ -601,7 +601,7 @@ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx, uint_t ofs = blob->length; switch (level) { - case RAW_SEARCH_DIRECTORY_INFO: + case RAW_SEARCH_DATA_DIRECTORY_INFO: BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, ofs + 64)); data = blob->data + ofs; SIVAL(data, 4, file->directory_info.file_index); @@ -619,7 +619,7 @@ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx, SIVAL(data, 0, blob->length - ofs); return NT_STATUS_OK; - case RAW_SEARCH_FULL_DIRECTORY_INFO: + case RAW_SEARCH_DATA_FULL_DIRECTORY_INFO: BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, ofs + 68)); data = blob->data + ofs; SIVAL(data, 4, file->full_directory_info.file_index); @@ -638,7 +638,7 @@ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx, SIVAL(data, 0, blob->length - ofs); return NT_STATUS_OK; - case RAW_SEARCH_NAME_INFO: + case RAW_SEARCH_DATA_NAME_INFO: BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, ofs + 12)); data = blob->data + ofs; SIVAL(data, 4, file->name_info.file_index); @@ -649,7 +649,7 @@ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx, SIVAL(data, 0, blob->length - ofs); return NT_STATUS_OK; - case RAW_SEARCH_BOTH_DIRECTORY_INFO: + case RAW_SEARCH_DATA_BOTH_DIRECTORY_INFO: BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, ofs + 94)); data = blob->data + ofs; SIVAL(data, 4, file->both_directory_info.file_index); @@ -679,7 +679,7 @@ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx, SIVAL(data, 0, blob->length - ofs); return NT_STATUS_OK; - case RAW_SEARCH_ID_FULL_DIRECTORY_INFO: + case RAW_SEARCH_DATA_ID_FULL_DIRECTORY_INFO: BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, ofs + 80)); data = blob->data + ofs; SIVAL(data, 4, file->id_full_directory_info.file_index); @@ -700,7 +700,7 @@ NTSTATUS smbsrv_push_passthru_search(TALLOC_CTX *mem_ctx, SIVAL(data, 0, blob->length - ofs); return NT_STATUS_OK; - case RAW_SEARCH_ID_BOTH_DIRECTORY_INFO: + case RAW_SEARCH_DATA_ID_BOTH_DIRECTORY_INFO: BLOB_CHECK(smbsrv_blob_grow_data(mem_ctx, blob, ofs + 104)); data = blob->data + ofs; SIVAL(data, 4, file->id_both_directory_info.file_index); -- cgit