From: Volker Lendecke <vl@samba.org>
Date: Fri, 9 Mar 2012 13:45:21 +0000 (+0100)
Subject: s3: Replace a SMB_ASSERT with an error return
X-Git-Tag: tdb-1.2.10~283
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a75d3d91e90cc0cf617f06c63660d354684a60b;p=thirdparty%2Fsamba.git

s3: Replace a SMB_ASSERT with an error return
---

diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index 8160d5ac638..4357af412ee 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"));