summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-01-12 23:05:23 +0100
committerVolker Lendecke <vl@samba.org>2008-01-12 23:57:11 +0100
commit5a8bbc64cc7327facb2a3d136b9c9a3e15a1903a (patch)
tree040fb4fa5c269f0f6c19a8bddb28989c8e1d0c5f
parentbb2c52ad43b12c30315189ebbd722ae3125e457b (diff)
downloadsamba-5a8bbc64cc7327facb2a3d136b9c9a3e15a1903a.tar.gz
samba-5a8bbc64cc7327facb2a3d136b9c9a3e15a1903a.tar.bz2
samba-5a8bbc64cc7327facb2a3d136b9c9a3e15a1903a.zip
Trivial simplification
(This used to be commit 616bc34744487450edd47e212a29c0f57eabb722)
-rw-r--r--source3/locking/locking.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 113b994bc7..bae4518575 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -1281,11 +1281,7 @@ static UNIX_USER_TOKEN *copy_unix_token(TALLOC_CTX *ctx, UNIX_USER_TOKEN *tok)
void set_delete_on_close_token(struct share_mode_lock *lck, UNIX_USER_TOKEN *tok)
{
- /* Ensure there's no token. */
- if (lck->delete_token) {
- TALLOC_FREE(lck->delete_token); /* Also deletes groups... */
- lck->delete_token = NULL;
- }
+ TALLOC_FREE(lck->delete_token); /* Also deletes groups... */
/* Copy the new token (can be NULL). */
lck->delete_token = copy_unix_token(lck, tok);