summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-12-14 09:50:24 +0100
committerStefan Metzmacher <metze@samba.org>2011-12-14 13:34:25 +0100
commitffa996e4797af1a38c484894fc03528f6fa73496 (patch)
treea1a76062510a8bd23ee3507f2162f14e6eec1020
parent324e66fd45747b64b1abc85f2ac2fb1e5ed31232 (diff)
downloadsamba-ffa996e4797af1a38c484894fc03528f6fa73496.tar.gz
samba-ffa996e4797af1a38c484894fc03528f6fa73496.tar.bz2
samba-ffa996e4797af1a38c484894fc03528f6fa73496.zip
s3:smb2_lock: use talloc_get_type_abort() as private_data can't be NULL
metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Wed Dec 14 13:34:25 CET 2011 on sn-devel-104
-rw-r--r--source3/smbd/smb2_lock.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index 57bcbe6806..10b35df4a6 100644
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -451,13 +451,9 @@ static void received_unlock_msg(struct messaging_context *msg,
DATA_BLOB *data)
{
struct smbd_server_connection *sconn =
- talloc_get_type(private_data,
+ talloc_get_type_abort(private_data,
struct smbd_server_connection);
- if (sconn == NULL) {
- return;
- }
-
DEBUG(10,("received_unlock_msg (SMB2)\n"));
process_blocking_lock_queue_smb2(sconn, timeval_current());