s4:torture:smb2: lease: oplock_level is uint8_t, not uint32_t or int
authorMichael Adam <obnox@samba.org>
Tue, 8 Nov 2011 15:33:56 +0000 (16:33 +0100)
committerMichael Adam <obnox@samba.org>
Wed, 9 Nov 2011 00:02:08 +0000 (01:02 +0100)
source4/torture/smb2/lease.c
source4/torture/smb2/util.c

index dca4bd4bb95e84e585b9878e98ebca492f74c3dd..007cde5c43679514ccb12fa6b507e7d6882505bb 100644 (file)
@@ -42,7 +42,7 @@
 
 static void smb2_generic_create(struct smb2_create *io, struct smb2_lease *ls,
                                 bool dir, const char *name, uint32_t disposition,
-                                uint32_t oplock, uint64_t leasekey,
+                                uint8_t oplock, uint64_t leasekey,
                                 uint32_t leasestate)
 {
        ZERO_STRUCT(*io);
@@ -88,7 +88,7 @@ static void smb2_lease_create(struct smb2_create *io, struct smb2_lease *ls,
 }
 
 static void smb2_oplock_create(struct smb2_create *io, const char *name,
-                               uint32_t oplock)
+                               uint8_t oplock)
 {
        smb2_generic_create(io, NULL, false, name, NTCREATEX_DISP_OPEN_IF,
            oplock, 0, 0);
@@ -398,8 +398,8 @@ static struct {
        int failures;
 
        struct smb2_handle oplock_handle;
-       int held_oplock_level;
-       int oplock_level;
+       uint8_t held_oplock_level;
+       uint8_t oplock_level;
        int oplock_count;
        int oplock_failures;
 } break_info;
index 85cf0f7fbaba0ff1754727744f393ae7754a7a44..4d078adbea111da6df80d3d87930bee2fcae9850 100644 (file)
@@ -544,9 +544,9 @@ uint32_t smb2_util_share_access(const char *sharemode)
        return val;
 }
 
-uint32_t smb2_util_oplock_level(const char *op)
+uint8_t smb2_util_oplock_level(const char *op)
 {
-       uint32_t val = SMB2_OPLOCK_LEVEL_NONE;
+       uint8_t val = SMB2_OPLOCK_LEVEL_NONE;
        int i;
 
        for (i = 0; i < strlen(op); i++) {