]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
libcli/smb: convert smb2_lease_pull() to PULL_LE_U*
authorStefan Metzmacher <metze@samba.org>
Wed, 16 Apr 2025 13:18:12 +0000 (15:18 +0200)
committerJule Anger <janger@samba.org>
Thu, 17 Apr 2025 15:59:12 +0000 (15:59 +0000)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15849

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Björn Jacke <bjacke@samba.org>
(cherry picked from commit 31ebf2cd1daeed25fab92ef71f7591fea8c92226)

libcli/smb/smb2_lease.c

index d28477b1911901a1870c5e9881d3e7c016ad439a..02b0cfa8dc5a050e66d6f586e21d55b328081bd9 100644 (file)
@@ -45,20 +45,20 @@ ssize_t smb2_lease_pull(const uint8_t *buf, size_t len,
        }
 
        memcpy(&lease->lease_key, buf, 16);
-       lease->lease_state = IVAL(buf, 16);
+       lease->lease_state = PULL_LE_U32(buf, 16);
        lease->lease_version = version;
 
        switch (version) {
        case 1:
                break;
        case 2:
-               lease->lease_flags = IVAL(buf, 20);
+               lease->lease_flags = PULL_LE_U32(buf, 20);
+               lease->lease_duration = PULL_LE_U64(buf, 24);
                lease->lease_flags &= SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET;
                if (lease->lease_flags & SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET) {
                        memcpy(&lease->parent_lease_key, buf+32, 16);
                }
-               lease->lease_duration = BVAL(buf, 24);
-               lease->lease_epoch = SVAL(buf, 48);
+               lease->lease_epoch = PULL_LE_U16(buf, 48);
                break;
        }