From 618b6fdef85006904370a1a35ba87c70673ee647 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 3 Jul 2014 15:35:33 +0000 Subject: [PATCH] smbd: Use BVAL Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher --- source3/smbd/trans2.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index a95edf80807..9003cc4da6e 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -5167,10 +5167,8 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn, smblctx = (uint64_t)IVAL(pdata, POSIX_LOCK_PID_OFFSET); #if defined(HAVE_LONGLONG) - offset = (((uint64_t) IVAL(pdata,(POSIX_LOCK_START_OFFSET+4))) << 32) | - ((uint64_t) IVAL(pdata,POSIX_LOCK_START_OFFSET)); - count = (((uint64_t) IVAL(pdata,(POSIX_LOCK_LEN_OFFSET+4))) << 32) | - ((uint64_t) IVAL(pdata,POSIX_LOCK_LEN_OFFSET)); + offset = BVAL(pdata,POSIX_LOCK_START_OFFSET); + count = BVAL(pdata,POSIX_LOCK_LEN_OFFSET); #else /* HAVE_LONGLONG */ offset = (uint64_t)IVAL(pdata,POSIX_LOCK_START_OFFSET); count = (uint64_t)IVAL(pdata,POSIX_LOCK_LEN_OFFSET); @@ -5191,10 +5189,8 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn, SSVAL(pdata, POSIX_LOCK_FLAGS_OFFSET, 0); SIVAL(pdata, POSIX_LOCK_PID_OFFSET, (uint32_t)smblctx); #if defined(HAVE_LONGLONG) - SIVAL(pdata, POSIX_LOCK_START_OFFSET, (uint32)(offset & 0xFFFFFFFF)); - SIVAL(pdata, POSIX_LOCK_START_OFFSET + 4, (uint32)((offset >> 32) & 0xFFFFFFFF)); - SIVAL(pdata, POSIX_LOCK_LEN_OFFSET, (uint32)(count & 0xFFFFFFFF)); - SIVAL(pdata, POSIX_LOCK_LEN_OFFSET + 4, (uint32)((count >> 32) & 0xFFFFFFFF)); + SBVAL(pdata, POSIX_LOCK_START_OFFSET, offset); + SBVAL(pdata, POSIX_LOCK_LEN_OFFSET, count); #else /* HAVE_LONGLONG */ SIVAL(pdata, POSIX_LOCK_START_OFFSET, offset); SIVAL(pdata, POSIX_LOCK_LEN_OFFSET, count); -- 2.11.4.GIT