From: Volker Lendecke <vl@samba.org>
Date: Fri, 1 Jun 2012 13:52:14 +0000 (+0200)
Subject: s3: Simplify get_delete_on_close_token more
X-Git-Tag: samba-4.0.0beta1~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dec08b8041c88211efa9efd190c3bb6b6946f599;p=thirdparty%2Fsamba.git

s3: Simplify get_delete_on_close_token more

All remaining callers actually want the token

Signed-off-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 0003f94d186..5da75957372 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -1081,12 +1081,8 @@ bool get_delete_on_close_token(struct share_mode_lock *lck,
 	if (dt == NULL) {
 		return false;
 	}
-	if (pp_nt_tok) {
-		*pp_nt_tok = dt->delete_nt_token;
-	}
-	if (pp_tok) {
-		*pp_tok =  dt->delete_token;
-	}
+	*pp_nt_tok = dt->delete_nt_token;
+	*pp_tok =  dt->delete_token;
 	return true;
 }