mirror of
https://github.com/samba-team/samba.git
synced 2025-12-24 04:23:53 +03:00
configure configure.in: Added checks for statvfs64. Last bit of 64 bit widening (I hope :-).
include/config.h.in: Added #undef STAT_STATVFS64.
include/includes.h: Added SMB_STRUCT_STATVFS type, Changed SMB_BIG_INTEGER to
SMB_BIG_UINT and SMB_BIG_INT types.
include/smb.h: Added flag defines from CIFS spec.
lib/debug.c: Fixed one more mode_t issue.
lib/system.c: Added sys_statvfs wrapper.
lib/util.c: Changed trim_string to use size_t.
param/loadparm.c: Moved "blocking locks" into locking section. Alphabetised
locking options. Question - shuld we do this for all options ?
passdb/ldap.c: Changed SMB_BIG_INTEGER to SMB_BIG_UINT.
passdb/nispass.c: Changed SMB_BIG_INTEGER to SMB_BIG_UINT.
passdb/smbpass.c: Changed SMB_BIG_INTEGER to SMB_BIG_UINT.
smbd/dfree.c: Changed to use 64 bit types if available. Moved to use unsigned
types.
smbd/dosmode.c: Fixed one more mode_t issue.
smbd/negprot.c: Changed literals to be FLAG_ #defines.
smbd/nttrans.c: Removed dead code.
smbd/open.c: Changed disk_free call.
smbd/process.c: Changed literals to be FLAG_ #defines.
smbd/reply.c: Changed disk_free call.
smbd/trans2.c: Fixed but in SMB_QUERY_FS_VOLUME_INFO call. Was using
UNICODE - should use ascii.
tests/summary.c: Added STAT_STATVFS64 check.
Jeremy.
This commit is contained in:
@@ -708,8 +708,8 @@ struct passdb_ops {
|
||||
*/
|
||||
void *(*startsmbpwent)(BOOL);
|
||||
void (*endsmbpwent)(void *);
|
||||
SMB_BIG_INTEGER (*getsmbpwpos)(void *);
|
||||
BOOL (*setsmbpwpos)(void *, SMB_BIG_INTEGER);
|
||||
SMB_BIG_UINT (*getsmbpwpos)(void *);
|
||||
BOOL (*setsmbpwpos)(void *, SMB_BIG_UINT);
|
||||
|
||||
/*
|
||||
* smb password database query functions.
|
||||
@@ -925,6 +925,15 @@ struct bitmap {
|
||||
#define smb_vwv16 69
|
||||
#define smb_vwv17 71
|
||||
|
||||
/* flag defines. CIFS spec 3.1.1 */
|
||||
#define FLAG_SUPPORT_LOCKREAD 0x01
|
||||
#define FLAG_CLIENT_BUF_AVAIL 0x02
|
||||
#define FLAG_RESERVED 0x04
|
||||
#define FLAG_CASELESS_PATHNAMES 0x08
|
||||
#define FLAG_CANONICAL_PATHNAMES 0x10
|
||||
#define FLAG_REQUEST_OPLOCK 0x20
|
||||
#define FLAG_REQUEST_BATCH_OPLOCK 0x40
|
||||
#define FLAG_REPLY 0x80
|
||||
|
||||
/* the complete */
|
||||
#define SMBmkdir 0x00 /* create directory */
|
||||
@@ -1115,7 +1124,7 @@ struct bitmap {
|
||||
/* these are for the NT create_and_X */
|
||||
#define smb_ntcreate_NameLength (smb_vwv0 + 5)
|
||||
#define smb_ntcreate_Flags (smb_vwv0 + 7)
|
||||
#define smb_ntcreate_RootDirectoryFid (smb_wvw0 + 11)
|
||||
#define smb_ntcreate_RootDirectoryFid (smb_vwv0 + 11)
|
||||
#define smb_ntcreate_DesiredAccess (smb_vwv0 + 15)
|
||||
#define smb_ntcreate_AllocationSize (smb_vwv0 + 19)
|
||||
#define smb_ntcreate_FileAttributes (smb_vwv0 + 27)
|
||||
@@ -1494,7 +1503,8 @@ extern int unix_ERR_code;
|
||||
/*
|
||||
* Core protocol.
|
||||
*/
|
||||
#define CORE_OPLOCK_REQUEST(inbuf) ((CVAL(inbuf,smb_flg)&((1<<5)|(1<<6)))>>5)
|
||||
#define CORE_OPLOCK_REQUEST(inbuf) \
|
||||
((CVAL(inbuf,smb_flg)&(FLAG_REQUEST_OPLOCK|FLAG_REQUEST_BATCH_OPLOCK))>>5)
|
||||
|
||||
/*
|
||||
* Extended protocol.
|
||||
|
||||
Reference in New Issue
Block a user