1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00

s3: Make close_remove_share_mode a bit more readable

by introducing a variable simplifying a boolean expression

Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Volker Lendecke 2012-06-01 16:13:22 +02:00 committed by Stefan Metzmacher
parent dec08b8041
commit 2e95b77c99

View File

@ -341,6 +341,7 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp,
const struct security_unix_token *del_token = NULL;
const struct security_token *del_nt_token = NULL;
bool got_tokens = false;
bool normal_close;
/* Ensure any pending write time updates are done. */
if (fsp->update_write_time_event) {
@ -449,8 +450,9 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp,
* reference to a file.
*/
if (!(close_type == NORMAL_CLOSE || close_type == SHUTDOWN_CLOSE) ||
!delete_file) {
normal_close = (close_type == NORMAL_CLOSE || close_type == SHUTDOWN_CLOSE);
if (!normal_close || !delete_file) {
TALLOC_FREE(lck);
return NT_STATUS_OK;
}