summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2017-07-01 08:27:57 +0200
committerRalph Boehme <slow@samba.org>2017-11-29 16:59:15 +0100
commit2f8055f676a52b01a609611bbc3361442bb81a9b (patch)
tree98522e3592479ed6092413cc1112527a368d11c7 /source3/smbd
parent4e86c322147ccf6e741b19ffb14fdd0d22bf927b (diff)
downloadsamba-2f8055f676a52b01a609611bbc3361442bb81a9b.tar.gz
dbwrap_watch: Remove the "prec" parameter from watch_recv
The initial idea was to have some "atomicity" in this API. Every caller interested in a record would have to do something with it once it changes. However, only one caller really used this feature, and that is easily changed to not use it. So remove the complexity. Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org>
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/open.c3
-rw-r--r--source3/smbd/smb2_setinfo.c3
-rw-r--r--source3/smbd/smbXsrv_session.c2
3 files changed, 3 insertions, 5 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 8c52f4bba56..e55c3941092 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2390,8 +2390,7 @@ static void defer_open_done(struct tevent_req *req)
NTSTATUS status;
bool ret;
- status = dbwrap_watched_watch_recv(req, talloc_tos(), NULL, NULL,
- NULL);
+ status = dbwrap_watched_watch_recv(req, NULL, NULL);
TALLOC_FREE(req);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(5, ("dbwrap_watched_watch_recv returned %s\n",
diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
index db00ba0f672..0355095c8b1 100644
--- a/source3/smbd/smb2_setinfo.c
+++ b/source3/smbd/smb2_setinfo.c
@@ -279,8 +279,7 @@ static void defer_rename_done(struct tevent_req *subreq)
int ret_size = 0;
bool ok;
- status = dbwrap_watched_watch_recv(subreq, state->req, NULL, NULL,
- NULL);
+ status = dbwrap_watched_watch_recv(subreq, NULL, NULL);
TALLOC_FREE(subreq);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(5, ("dbwrap_record_watch_recv returned %s\n",
diff --git a/source3/smbd/smbXsrv_session.c b/source3/smbd/smbXsrv_session.c
index 24767483287..9e1fb6977b4 100644
--- a/source3/smbd/smbXsrv_session.c
+++ b/source3/smbd/smbXsrv_session.c
@@ -1129,7 +1129,7 @@ static void smb2srv_session_close_previous_modified(struct tevent_req *subreq)
uint32_t global_id;
NTSTATUS status;
- status = dbwrap_watched_watch_recv(subreq, state, NULL, NULL, NULL);
+ status = dbwrap_watched_watch_recv(subreq, NULL, NULL);
TALLOC_FREE(subreq);
if (tevent_req_nterror(req, status)) {
return;