diff options
| author | Volker Lendecke <vl@samba.org> | 2012-06-01 15:52:14 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-06-03 17:23:28 +0200 |
| commit | dec08b8041c88211efa9efd190c3bb6b6946f599 (patch) | |
| tree | 1eff0f4fe7bcfc5ce85e9cf5d815995a3cde18c5 | |
| parent | 103b89fb071966eb5ca135039249e5def5eb0250 (diff) | |
| download | samba-dec08b8041c88211efa9efd190c3bb6b6946f599.tar.gz samba-dec08b8041c88211efa9efd190c3bb6b6946f599.tar.bz2 samba-dec08b8041c88211efa9efd190c3bb6b6946f599.zip | |
s3: Simplify get_delete_on_close_token more
All remaining callers actually want the token
Signed-off-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source3/locking/locking.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 0003f94d18..5da7595737 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; } |