summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libcli/smb/smb2_lock.h32
-rw-r--r--libcli/smb/smb_common.h1
-rw-r--r--source4/libcli/raw/interfaces.h7
3 files changed, 34 insertions, 6 deletions
diff --git a/libcli/smb/smb2_lock.h b/libcli/smb/smb2_lock.h
new file mode 100644
index 00000000000..f0e05355232
--- /dev/null
+++ b/libcli/smb/smb2_lock.h
@@ -0,0 +1,32 @@
+/*
+ * Unix SMB/CIFS implementation.
+ *
+ * Copyright (C) Volker Lendecke 2019
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __LIBCLI_SMB_SMB2_LOCK_H__
+#define __LIBCLI_SMB_SMB2_LOCK_H__
+
+#include "replace.h"
+
+struct smb2_lock_element {
+ uint64_t offset;
+ uint64_t length;
+ uint32_t flags;
+ uint32_t reserved;
+};
+
+#endif
diff --git a/libcli/smb/smb_common.h b/libcli/smb/smb_common.h
index 2f66b0a8360..0117570b537 100644
--- a/libcli/smb/smb_common.h
+++ b/libcli/smb/smb_common.h
@@ -26,6 +26,7 @@
#include "libcli/smb/smb2_constants.h"
#include "libcli/smb/smb2_create_blob.h"
#include "libcli/smb/smb2_lease.h"
+#include "libcli/smb/smb2_lock.h"
#include "libcli/smb/smb2_signing.h"
#include "libcli/smb/smb_util.h"
#include "libcli/smb/smb_unix_ext.h"
diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index d44c451f650..19b29197e16 100644
--- a/source4/libcli/raw/interfaces.h
+++ b/source4/libcli/raw/interfaces.h
@@ -2086,12 +2086,7 @@ union smb_lock {
uint16_t lock_count;
uint32_t lock_sequence;
/* struct smb2_handle handle; */
- struct smb2_lock_element {
- uint64_t offset;
- uint64_t length;
- uint32_t flags;
- uint32_t reserved;
- } *locks;
+ struct smb2_lock_element *locks;
} in;
struct {
/* static body buffer 4 (0x04) bytes */