libsmb: Move "struct smb2_lease" to common

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/libcli/smb/smb2_lease.h b/libcli/smb/smb2_lease.h
new file mode 100644 (file)
index 0000000..7fc598b
--- /dev/null
+++ b/libcli/smb/smb2_lease.h
@@ -0,0 +1,43 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   SMB2 Lease context handling
+
+   Copyright (C) Stefan Metzmacher 2012
+   Copyright (C) Volker Lendecke 2013
+
+   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_LEASE_H_
+#define _LIBCLI_SMB_SMB2_LEASE_H_
+
+/*
+  SMB2 lease structure (per MS-SMB2 2.2.13)
+*/
+struct smb2_lease_key {
+       uint64_t data[2];
+};
+
+struct smb2_lease {
+       struct smb2_lease_key lease_key;
+       uint32_t lease_state;
+       uint32_t lease_flags;
+       uint64_t lease_duration; /* should be 0 */
+       /* only for v2 */
+       struct smb2_lease_key parent_lease_key;
+       uint16_t lease_epoch;
+};
+
+#endif /* _LIBCLI_SMB_SMB2_LEASE_H_ */

diff --git a/libcli/smb/smb_common.h b/libcli/smb/smb_common.h
index 47a336a38f4d2fe65135d67831da37534a162f1b..2f66b0a8360ef9f54e16dd2445262dc8e85d9b2b 100644 (file)
--- a/libcli/smb/smb_common.h
+++ b/libcli/smb/smb_common.h
@@ -25,6 +25,7 @@
 #include "libcli/smb/smb_constants.h"
 #include "libcli/smb/smb2_constants.h"
 #include "libcli/smb/smb2_create_blob.h"
+#include "libcli/smb/smb2_lease.h"
 #include "libcli/smb/smb2_signing.h"
 #include "libcli/smb/smb_util.h"
 #include "libcli/smb/smb_unix_ext.h"

diff --git a/libcli/smb/wscript b/libcli/smb/wscript
index 3616ad140f60f44c0bdcd4cd94a98bcc1bf1de0a..13cf894ca5b0b1c179d59c16fb9a8eb9294b9312 100755 (executable)
--- a/libcli/smb/wscript
+++ b/libcli/smb/wscript
@@ -41,6 +41,7 @@ def build(bld):
                smb_common.h smb2_constants.h smb_constants.h
                smb_signing.h smb_seal.h
                smb2_create_blob.h smb2_signing.h
+               smb2_lease.h
                smb_util.h
                smb_unix_ext.h
        ''',

diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index fb73f26a42611144df1fce414b13524368bc0dac..7bc79cad2181fa2c4da7c17210ff7bde33a15a71 100644 (file)
--- a/source4/libcli/raw/interfaces.h
+++ b/source4/libcli/raw/interfaces.h
@@ -54,23 +54,6 @@ struct smb2_handle {
        uint64_t data[2];
 };
 
-/*
-  SMB2 lease structure (per MS-SMB2 2.2.13)
-*/
-struct smb2_lease_key {
-       uint64_t data[2];
-};
-
-struct smb2_lease {
-       struct smb2_lease_key lease_key;
-       uint32_t lease_state;
-       uint32_t lease_flags;
-       uint64_t lease_duration; /* should be 0 */
-       /* only for v2 */
-       struct smb2_lease_key parent_lease_key;
-       uint16_t lease_epoch;
-};
-
 struct smb2_lease_break {
        struct smb2_lease current_lease;
        uint32_t break_flags;