sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-05 09:18:06 +03:00
Code

s4:libcli/smb2: let smb2_deltree delete directory streams

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15656

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
This commit is contained in:
Stefan Metzmacher 2024-07-18 16:22:55 +02:00 committed by Volker Lendecke
parent b1b1f2ea6b
commit e2a9cd1d02
1 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
source4/libcli/smb2/util.c
View File

@ -183,6 +183,7 @@ int smb2_deltree(struct smb2_tree *tree, const char *dname)
TALLOC_CTX *tmp_ctx = talloc_new(tree); TALLOC_CTX *tmp_ctx = talloc_new(tree);
struct smb2_find f; struct smb2_find f;
struct smb2_create create_parm; struct smb2_create create_parm;
union smb_fileinfo finfo;
bool did_delete; bool did_delete;
/* it might be a file */ /* it might be a file */
@ -224,6 +225,49 @@ int smb2_deltree(struct smb2_tree *tree, const char *dname)
return -1; return -1;
} }
ZERO_STRUCT(finfo);
finfo.generic.level = RAW_FILEINFO_STREAM_INFORMATION;
finfo.generic.in.file.handle = create_parm.out.file.handle;
status = smb2_getinfo_file(tree, tmp_ctx, &finfo);
if (NT_STATUS_IS_OK(status)) {
/*
* For directories we need to cleanup
* streams manually
*/
for (i = 0; i < finfo.stream_info.out.num_streams; i++) {
const struct stream_struct *s =
&finfo.stream_info.out.streams[i];
union smb_unlink io;
char *spath = NULL;
if (strequal(s->stream_name.s, "::$DATA")) {
/* should not happen for directories */
continue;
}
spath = talloc_asprintf(tmp_ctx,
"%s%s",
dname,
s->stream_name.s);
if (spath == NULL) {
talloc_free(tmp_ctx);
return -1;
}
ZERO_STRUCT(io);
io.unlink.in.pattern = spath;
if (s->alloc_size != 0) {
io.unlink.in.truncate_if_needed = true;
}
status = smb2_composite_unlink(tree, &io);
TALLOC_FREE(spath);
if (NT_STATUS_IS_OK(status)) {
total_deleted++;
}
}
}
do { do {
did_delete = false; did_delete = false;