sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-10 12:58:35 +03:00
Code

s3-notify: Lift "/." handling up one level

Browse Source 
This slightly simplifies the code

Autobuild-User: Volker Lendecke <vl@samba.org>
Autobuild-Date: Fri Mar 16 14:28:44 CET 2012 on sn-devel-104
This commit is contained in:
Volker Lendecke 2012-03-15 13:02:15 +01:00
parent 640a7d0db7
commit 8503eecabb
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source3/smbd/notify.c
View File

@ -178,6 +178,7 @@ NTSTATUS change_notify_create(struct files_struct *fsp, uint32 filter,
bool recursive) bool recursive)
{ {
char *fullpath; char *fullpath;
size_t len;
struct notify_entry e; struct notify_entry e;
NTSTATUS status; NTSTATUS status;
@ -202,6 +203,14 @@ NTSTATUS change_notify_create(struct files_struct *fsp, uint32 filter,
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
/*
* Avoid /. at the end of the path name. notify can't deal with it.
*/
len = strlen(fullpath);
if (len > 1 && fullpath[len-1] == '.' && fullpath[len-2] == '/') {
fullpath[len-2] = '\0';
}
ZERO_STRUCT(e); ZERO_STRUCT(e);
e.path = fullpath; e.path = fullpath;
e.dir_fd = fsp->fh->fd; e.dir_fd = fsp->fh->fd;

15
source3/smbd/notify_internal.c
View File

@ -511,9 +511,7 @@ NTSTATUS notify_add(struct notify_context *notify, struct notify_entry *e0,
{ {
struct notify_entry e = *e0; struct notify_entry e = *e0;
NTSTATUS status; NTSTATUS status;
char *tmp_path = NULL;
struct notify_list *listel; struct notify_list *listel;
size_t len;
int depth; int depth;
/* see if change notify is enabled at all */ /* see if change notify is enabled at all */
@ -521,17 +519,6 @@ NTSTATUS notify_add(struct notify_context *notify, struct notify_entry *e0,
return NT_STATUS_NOT_IMPLEMENTED; return NT_STATUS_NOT_IMPLEMENTED;
} }
/* cope with /. on the end of the path */
len = strlen(e.path);
if (len > 1 && e.path[len-1] == '.' && e.path[len-2] == '/') {
tmp_path = talloc_strndup(notify, e.path, len-2);
if (tmp_path == NULL) {
status = NT_STATUS_NO_MEMORY;
goto done;
}
e.path = tmp_path;
}
depth = count_chars(e.path, '/'); depth = count_chars(e.path, '/');
listel = talloc_zero(notify, struct notify_list); listel = talloc_zero(notify, struct notify_list);
@ -586,8 +573,6 @@ NTSTATUS notify_add(struct notify_context *notify, struct notify_entry *e0,
} }
status = NT_STATUS_OK; status = NT_STATUS_OK;
done: done:
talloc_free(tmp_path);
return status; return status;
} }