diff options
| author | Gerald Carter <jerry@samba.org> | 2005-07-12 13:42:21 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2005-07-12 13:42:21 +0000 |
| commit | 7b85a3ad76d9549fa4948b1a2e1d06acc4dd268b (patch) | |
| tree | b557425ca88bf877ee120d1f4d143e2d796a37a0 | |
| parent | 43e83b009de0dc1e4c2e69eef95407cce69e783d (diff) | |
| download | samba-7b85a3ad76d9549fa4948b1a2e1d06acc4dd268b.tar.gz | |
r8378: sync up to r8366 in SAMBA_3_0; last changes for 3.0.20pre2
| -rw-r--r-- | source/include/ntioctl.h | 4 | ||||
| -rw-r--r-- | source/modules/vfs_afsacl.c | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/source/include/ntioctl.h b/source/include/ntioctl.h index 9814c88e5e5..9b748d38ed1 100644 --- a/source/include/ntioctl.h +++ b/source/include/ntioctl.h @@ -42,6 +42,8 @@ #define FSCTL_REQUEST_FILTER_OPLOCK 0x0009008C #define FSCTL_FIND_FILES_BY_SID 0x0009008F #define FSCTL_FILESYS_GET_STATISTICS 0x00090090 +#define FSCTL_SET_OBJECT_ID 0x00090098 +#define FSCTL_GET_OBJECT_ID 0x0009009C #define FSCTL_SET_REPARSE_POINT 0x000900A4 #define FSCTL_GET_REPARSE_POINT 0x000900A8 #define FSCTL_DELETE_REPARSE_POINT 0x000900AC @@ -53,6 +55,7 @@ #define FSCTL_WRITE_RAW_ENCRYPTED 0x000900DF #define FSCTL_READ_RAW_ENCRYPTED 0x000900E3 #define FSCTL_SIS_COPYFILE 0x00090100 +#define FSCTL_QUERY_ALLOCATED_RANGES 0x000940CF #define FSCTL_SIS_LINK_FILES 0x0009C104 #define FSCTL_GET_SHADOW_COPY_DATA 0x00144064 /* KJC -- Shadow Copy information */ @@ -63,7 +66,6 @@ #define FSCTL_GET_NTFS_FILE_RECORD #define FSCTL_ALLOW_EXTENDED_DASD_IO #define FSCTL_RECALL_FILE -#define FSCTL_QUERY_ALLOCATED_RANGES #endif diff --git a/source/modules/vfs_afsacl.c b/source/modules/vfs_afsacl.c index 731ddfa5836..0e2e1295b9f 100644 --- a/source/modules/vfs_afsacl.c +++ b/source/modules/vfs_afsacl.c @@ -891,12 +891,14 @@ static BOOL afs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp, pstr_sprintf(name, fsp->fsp_name); if (!fsp->is_directory) { + /* We need to get the name of the directory containing the + * file, this is where the AFS acls live */ char *p = strrchr(name, '/'); - if (p == NULL) { - DEBUG(3, ("No / in file string\n")); - return False; + if (p != NULL) { + *p = '\0'; + } else { + pstrcpy(name, "."); } - *p = '\0'; } if (!afs_get_afs_acl(name, &old_afs_acl)) { |