From 96a8f6e0fb9042fe125c9552dfb4c3f6d19cb225 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 17 Apr 2013 16:48:21 +0200 Subject: [PATCH] libsmb: Move "struct smb2_lease" to common Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher --- libcli/smb/{smb_common.h => smb2_lease.h} | 35 ++++++++++++++++++++----------- libcli/smb/smb_common.h | 1 + libcli/smb/wscript | 1 + source4/libcli/raw/interfaces.h | 17 --------------- 4 files changed, 25 insertions(+), 29 deletions(-) copy libcli/smb/{smb_common.h => smb2_lease.h} (55%) diff --git a/libcli/smb/smb_common.h b/libcli/smb/smb2_lease.h similarity index 55% copy from libcli/smb/smb_common.h copy to libcli/smb/smb2_lease.h index 47a336a38f4..7fc598b2587 100644 --- a/libcli/smb/smb_common.h +++ b/libcli/smb/smb2_lease.h @@ -1,9 +1,10 @@ /* Unix SMB/CIFS implementation. - SMB and SMB2 common header + SMB2 Lease context handling - Copyright (C) Stefan Metzmacher 2009 + 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 @@ -19,14 +20,24 @@ along with this program. If not, see . */ -#ifndef __LIBCLI_SMB_SMB_COMMON_H__ -#define __LIBCLI_SMB_SMB_COMMON_H__ +#ifndef _LIBCLI_SMB_SMB2_LEASE_H_ +#define _LIBCLI_SMB_SMB2_LEASE_H_ -#include "libcli/smb/smb_constants.h" -#include "libcli/smb/smb2_constants.h" -#include "libcli/smb/smb2_create_blob.h" -#include "libcli/smb/smb2_signing.h" -#include "libcli/smb/smb_util.h" -#include "libcli/smb/smb_unix_ext.h" - -#endif +/* + 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 47a336a38f4..2f66b0a8360 100644 --- 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 3616ad140f6..13cf894ca5b 100755 --- 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 fb73f26a426..7bc79cad218 100644 --- 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; -- 2.11.4.GIT