sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

libsmb: Put the "smb2_lease" struct into idl

Browse Source 
This will make it easier in the future to NDR_PRINT a lease and
a lease key

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Jun 12 03:34:41 CEST 2014 on sn-devel-104
This commit is contained in:
Volker Lendecke 2014-06-05 10:57:36 +00:00 committed by Jeremy Allison
parent 4e95d78527
commit 1dda098401
7 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libcli/smb/smb2_constants.h
View File

@ -181,9 +181,6 @@
/* SMB2 lease bits */
#define SMB2_LEASE_NONE 0x00
#define SMB2_LEASE_READ 0x01
#define SMB2_LEASE_HANDLE 0x02
#define SMB2_LEASE_WRITE 0x04
/* SMB2 lease flags */
#define SMB2_LEASE_FLAG_BREAK_IN_PROGRESS 0x00000002

17
libcli/smb/smb2_lease.h
View File

@ -23,22 +23,7 @@
#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;
};
#include "librpc/gen_ndr/smb2_lease_struct.h"
/*
* Parse a smb2 lease create context. Return -1 on error, buffer.length on

5
libcli/smb/wscript
View File

@ -40,7 +40,10 @@ def build(bld):
smb2cli_echo.c
tstream_smbXcli_np.c
''',
deps='LIBCRYPTO errors gensec krb5samba smb_transport',
deps='''
LIBCRYPTO NDR_SMB2_LEASE_STRUCT errors gensec krb5samba
smb_transport
''',
public_deps='talloc samba-util',
private_library=True,
public_headers='''

33
librpc/idl/smb2_lease_struct.idl Normal file
View File

@ -0,0 +1,33 @@
#include "idl_types.h"
/*
miscellaneous IDL structures
*/
[
pointer_default(unique)
]
interface smb2_lease_struct
{
/*
* SMB2 lease structure (per MS-SMB2 2.2.13)
*/
typedef [public] struct {
hyper data[2];
} smb2_lease_key;
typedef [public,bitmap32bit] bitmap {
SMB2_LEASE_READ = 0x01,
SMB2_LEASE_WRITE = 0x02,
SMB2_LEASE_HANDLE = 0x04
} smb2_lease_state;
typedef [public] struct {
smb2_lease_key lease_key;
smb2_lease_state lease_state;
uint32 lease_flags;
uint32 lease_duration; /* should be 0 */
smb2_lease_key parent_lease_key;
uint16 lease_epoch;
} smb2_lease;
};

1
librpc/idl/wscript_build
View File

@ -11,6 +11,7 @@ bld.SAMBA_PIDL_LIST('PIDL',
oxidresolver.idl samr.idl server_id.idl srvsvc.idl winreg.idl dcerpc.idl
drsblobs.idl efs.idl frstrans.idl mgmt.idl netlogon.idl
notify.idl
smb2_lease_struct.idl
policyagent.idl scerpc.idl svcctl.idl wkssvc.idl eventlog6.idl backupkey.idl
fsrvp.idl witness.idl''',
options='--header --ndr-parser --samba3-ndr-server --server --client --python',

6
librpc/wscript_build
View File

@ -353,6 +353,12 @@ bld.SAMBA_SUBSYSTEM('NDR_XATTR',
public_deps='ndr NDR_SECURITY'
)
bld.SAMBA_SUBSYSTEM('NDR_SMB2_LEASE_STRUCT',
source='gen_ndr/ndr_smb2_lease_struct.c',
public_deps='ndr',
public_headers='gen_ndr/smb2_lease_struct.h'
)
bld.SAMBA_SUBSYSTEM('NDR_SCHANNEL',
source='ndr/ndr_schannel.c gen_ndr/ndr_schannel.c',
public_deps='ndr ndr_nbt'

1
source4/libcli/raw/interfaces.h
View File

@ -25,6 +25,7 @@
#include "source4/libcli/raw/smb.h"
#include "../libcli/smb/smb_common.h"
#include "librpc/gen_ndr/misc.h" /* for struct GUID */
#include "librpc/gen_ndr/smb2_lease_struct.h"
/* this structure is just a wrapper for a string, the only reason we
bother with this is that it allows us to check the length provided