From e0e5f67da522521a37622a5833b8699ae63e8c27 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 14 Sep 2013 13:49:14 +0200 Subject: smbd: Convert set_share_mode to return bool for success Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- source3/smbd/open.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/open.c b/source3/smbd/open.c index 858d2befc2..55f2fb2164 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -2681,9 +2681,13 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn, fsp->oplock_type = NO_OPLOCK; } - set_share_mode(lck, fsp, get_current_uid(conn), - req ? req->mid : 0, - fsp->oplock_type); + if (!set_share_mode(lck, fsp, get_current_uid(conn), + req ? req->mid : 0, + fsp->oplock_type)) { + TALLOC_FREE(lck); + fd_close(fsp); + return NT_STATUS_NO_MEMORY; + } /* Handle strange delete on close create semantics. */ if (create_options & FILE_DELETE_ON_CLOSE) { @@ -3173,8 +3177,13 @@ static NTSTATUS open_directory(connection_struct *conn, return status; } - set_share_mode(lck, fsp, get_current_uid(conn), - req ? req->mid : 0, NO_OPLOCK); + if (!set_share_mode(lck, fsp, get_current_uid(conn), + req ? req->mid : 0, NO_OPLOCK)) { + TALLOC_FREE(lck); + fd_close(fsp); + file_free(req, fsp); + return NT_STATUS_NO_MEMORY; + } /* For directories the delete on close bit at open time seems always to be honored on close... See test 19 in Samba4 BASE-DELETE. */ -- cgit