svn commit: samba r8378 - in branches/SAMBA_3_0_RELEASE/source: include modules

[jerry at samba.org]

Author: jerry
Date: 2005-07-12 13:42:21 +0000 (Tue, 12 Jul 2005)
New Revision: 8378

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8378

Log:
sync up to r8366 in SAMBA_3_0; last changes for 3.0.20pre2
Modified:
   branches/SAMBA_3_0_RELEASE/source/include/ntioctl.h
   branches/SAMBA_3_0_RELEASE/source/modules/vfs_afsacl.c


Changeset:
Modified: branches/SAMBA_3_0_RELEASE/source/include/ntioctl.h
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/include/ntioctl.h	2005-07-12 13:37:11 UTC (rev 8377)
+++ branches/SAMBA_3_0_RELEASE/source/include/ntioctl.h	2005-07-12 13:42:21 UTC (rev 8378)
@@ -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
 

Modified: branches/SAMBA_3_0_RELEASE/source/modules/vfs_afsacl.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/modules/vfs_afsacl.c	2005-07-12 13:37:11 UTC (rev 8377)
+++ branches/SAMBA_3_0_RELEASE/source/modules/vfs_afsacl.c	2005-07-12 13:42:21 UTC (rev 8378)
@@ -891,12 +891,14 @@
 	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)) {