s3: Simplify get_delete_on_close_token more
authorVolker Lendecke <vl@samba.org>
Fri, 1 Jun 2012 13:52:14 +0000 (15:52 +0200)
committerStefan Metzmacher <metze@samba.org>
Sun, 3 Jun 2012 15:23:28 +0000 (17:23 +0200)
All remaining callers actually want the token

Signed-off-by: Stefan Metzmacher <metze@samba.org>
source3/locking/locking.c

index 0003f94d18666307353e0c8f62e3e6b46446c780..5da759573728d8e64b2b658eb90f1e327ea76305 100644 (file)
@@ -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;
 }