summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-03-09 14:45:21 +0100
committerVolker Lendecke <vl@samba.org>2012-03-09 17:21:55 +0100
commit8a75d3d91e90cc0cf617f06c63660d354684a60b (patch)
tree7e551a21c5fb9d444dcd5aabdc1c6063092e9928 /source3
parent1bf126c0b3bc3b6d73571bba4105f46bd1ad68ce (diff)
downloadsamba-8a75d3d91e90cc0cf617f06c63660d354684a60b.tar.gz
samba-8a75d3d91e90cc0cf617f06c63660d354684a60b.tar.bz2
samba-8a75d3d91e90cc0cf617f06c63660d354684a60b.zip
s3: Replace a SMB_ASSERT with an error return
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/notify.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index 8160d5ac63..4357af412e 100644
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -181,7 +181,11 @@ NTSTATUS change_notify_create(struct files_struct *fsp, uint32 filter,
struct notify_entry e;
NTSTATUS status;
- SMB_ASSERT(fsp->notify == NULL);
+ if (fsp->notify != NULL) {
+ DEBUG(1, ("change_notify_create: fsp->notify != NULL, "
+ "fname = %s\n", fsp->fsp_name->base_name));
+ return NT_STATUS_INVALID_PARAMETER;
+ }
if (!(fsp->notify = talloc_zero(NULL, struct notify_change_buf))) {
DEBUG(0, ("talloc failed\n"));