diff options
| author | Gerald Carter <jerry@samba.org> | 2004-05-07 18:31:17 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2004-05-07 18:31:17 +0000 |
| commit | d391651d4211fc88c89447c3e86eba1ecd4e3f52 (patch) | |
| tree | f60ec29ae8e9e830a15312bd845121810356a067 /source/include | |
| parent | b7fc60b599845f29dd1fe44e50420f6044ba7d5e (diff) | |
| download | samba-d391651d4211fc88c89447c3e86eba1ecd4e3f52.tar.gz | |
r567: getting ready for 3.0.4 -- still holding for one more bug fix
Diffstat (limited to 'source/include')
| -rw-r--r-- | source/include/debug.h | 1 | ||||
| -rw-r--r-- | source/include/fake_file.h | 4 | ||||
| -rw-r--r-- | source/include/rpc_samr.h | 3 | ||||
| -rw-r--r-- | source/include/smb_macros.h | 7 | ||||
| -rw-r--r-- | source/include/vfs.h | 3 |
5 files changed, 13 insertions, 5 deletions
diff --git a/source/include/debug.h b/source/include/debug.h index 55f07d8a18e..52e06b9360b 100644 --- a/source/include/debug.h +++ b/source/include/debug.h @@ -93,6 +93,7 @@ extern int DEBUGLEVEL; #define DBGC_VFS 12 #define DBGC_IDMAP 13 #define DBGC_QUOTA 14 +#define DBGC_ACLS 15 /* So you can define DBGC_CLASS before including debug.h */ #ifndef DBGC_CLASS diff --git a/source/include/fake_file.h b/source/include/fake_file.h index 3fe60072e9e..cfcd16f6830 100644 --- a/source/include/fake_file.h +++ b/source/include/fake_file.h @@ -26,7 +26,11 @@ enum FAKE_FILE_TYPE { FAKE_FILE_TYPE_QUOTA }; +/* +we now get the unix name --metze #define FAKE_FILE_NAME_QUOTA "\\$Extend\\$Quota:$Q:$INDEX_ALLOCATION" +*/ +#define FAKE_FILE_NAME_QUOTA "$Extend/$Quota:$Q:$INDEX_ALLOCATION" typedef struct _FAKE_FILE_HANDLE { enum FAKE_FILE_TYPE type; diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h index 111e62c3553..089941de3aa 100644 --- a/source/include/rpc_samr.h +++ b/source/include/rpc_samr.h @@ -1740,9 +1740,8 @@ typedef struct r_samr_get_dom_pwinfo * turned out to 12. 3 uint32's + NT_STATUS == 16 bytes. Tested * using NT and 2k. --jerry */ - uint32 unk_0; + uint16 unk_0; uint32 unk_1; - uint32 unk_2; NTSTATUS status; } SAMR_R_GET_DOM_PWINFO; diff --git a/source/include/smb_macros.h b/source/include/smb_macros.h index c3bdba30b15..e847714443a 100644 --- a/source/include/smb_macros.h +++ b/source/include/smb_macros.h @@ -171,9 +171,10 @@ /* these are the datagram types */ #define DGRAM_DIRECT_UNIQUE 0x10 -#define ERROR_DOS(class,code) error_packet(outbuf,NT_STATUS_OK,class,code,__LINE__,__FILE__) -#define ERROR_NT(status) error_packet(outbuf,status,0,0,__LINE__,__FILE__) -#define ERROR_BOTH(status,class,code) error_packet(outbuf,status,class,code,__LINE__,__FILE__) +#define ERROR_DOS(class,code) error_packet(outbuf,NT_STATUS_OK,class,code,False,__LINE__,__FILE__) +#define ERROR_FORCE_DOS(class,code) error_packet(outbuf,NT_STATUS_OK,class,code,True,__LINE__,__FILE__) +#define ERROR_NT(status) error_packet(outbuf,status,0,0,False,__LINE__,__FILE__) +#define ERROR_BOTH(status,class,code) error_packet(outbuf,status,class,code,False,__LINE__,__FILE__) /* this is how errors are generated */ #define UNIXERROR(defclass,deferror) unix_error_packet(outbuf,defclass,deferror,__LINE__,__FILE__) diff --git a/source/include/vfs.h b/source/include/vfs.h index 8caf64fd99d..db766b985d9 100644 --- a/source/include/vfs.h +++ b/source/include/vfs.h @@ -41,6 +41,9 @@ * This next constant specifies the version number of the VFS interface * this smbd will load. Increment this if *ANY* changes are made to the * vfs_ops below. JRA. + * + * If you change anything here, please also update modules/vfs_full_audit.c. + * VL. */ /* Changed to version 2 for CIFS UNIX extensions (mknod and link added). JRA. */ |