s3: Remove smbd_server_conn from process_blocking_lock_cancel_message
authorVolker Lendecke <vl@samba.org>
Sun, 3 Oct 2010 15:37:24 +0000 (17:37 +0200)
committerVolker Lendecke <vl@samba.org>
Sun, 3 Oct 2010 16:17:09 +0000 (18:17 +0200)
source3/smbd/blocking.c

index bc4d06404fd030d61707afc266e4da046991db2e..dd99666034c2bc7d811b36eeccfaa6d07e6ef218 100644 (file)
@@ -828,7 +828,7 @@ static void process_blocking_lock_cancel_message(struct messaging_context *ctx,
                                                 struct server_id server_id,
                                                 DATA_BLOB *data)
 {
-       struct smbd_server_connection *sconn = smbd_server_conn;
+       struct smbd_server_connection *sconn;
        NTSTATUS err;
        const char *msg = (const char *)data->data;
        struct blocking_lock_record *blr;
@@ -843,6 +843,12 @@ static void process_blocking_lock_cancel_message(struct messaging_context *ctx,
                smb_panic("process_blocking_lock_cancel_message: bad msg");
         }
 
+       sconn = msg_ctx_to_sconn(ctx);
+       if (sconn == NULL) {
+               DEBUG(1, ("could not find sconn\n"));
+               return;
+       }
+
        memcpy(&blr, msg, sizeof(blr));
        memcpy(&err, &msg[sizeof(blr)], sizeof(NTSTATUS));