svn commit: samba r7889 - in trunk/source/smbd: .

[jra at samba.org]

Author: jra
Date: 2005-06-24 21:44:10 +0000 (Fri, 24 Jun 2005)
New Revision: 7889

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

Log:
Fix use of "protected".
Jeremy.

Modified:
   trunk/source/smbd/posix_acls.c


Changeset:
Modified: trunk/source/smbd/posix_acls.c
===================================================================
--- trunk/source/smbd/posix_acls.c	2005-06-24 21:43:36 UTC (rev 7888)
+++ trunk/source/smbd/posix_acls.c	2005-06-24 21:44:10 UTC (rev 7889)
@@ -84,7 +84,7 @@
 };
 	
 struct pai_val {
-	BOOL protected;
+	BOOL pai_protected;
 	unsigned int num_entries;
 	struct pai_entry *entry_list;
 	unsigned int num_def_entries;
@@ -149,7 +149,7 @@
  Create the on-disk format. Caller must free.
 ************************************************************************/
 
-static char *create_pai_buf(canon_ace *file_ace_list, canon_ace *dir_ace_list, BOOL protected, size_t *store_size)
+static char *create_pai_buf(canon_ace *file_ace_list, canon_ace *dir_ace_list, BOOL pai_protected, size_t *store_size)
 {
 	char *pai_buf = NULL;
 	canon_ace *ace_list = NULL;
@@ -177,7 +177,7 @@
 	/* Set up the header. */
 	memset(pai_buf, '\0', PAI_ENTRIES_BASE);
 	SCVAL(pai_buf,PAI_VERSION_OFFSET,PAI_VERSION);
-	SCVAL(pai_buf,PAI_FLAG_OFFSET,(protected ? PAI_ACL_FLAG_PROTECTED : 0));
+	SCVAL(pai_buf,PAI_FLAG_OFFSET,(pai_protected ? PAI_ACL_FLAG_PROTECTED : 0));
 	SSVAL(pai_buf,PAI_NUM_ENTRIES_OFFSET,num_entries);
 	SSVAL(pai_buf,PAI_NUM_DEFAULT_ENTRIES_OFFSET,num_def_entries);
 
@@ -213,7 +213,7 @@
 ************************************************************************/
 
 static void store_inheritance_attributes(files_struct *fsp, canon_ace *file_ace_list,
-					canon_ace *dir_ace_list, BOOL protected)
+					canon_ace *dir_ace_list, BOOL pai_protected)
 {
 	int ret;
 	size_t store_size;
@@ -227,7 +227,7 @@
 	 * none of the entries in it are marked as inherited.
 	 */
 
-	if (!protected && num_inherited_entries(file_ace_list) == 0 && num_inherited_entries(dir_ace_list) == 0) {
+	if (!pai_protected && num_inherited_entries(file_ace_list) == 0 && num_inherited_entries(dir_ace_list) == 0) {
 		/* Instead just remove the attribute if it exists. */
 		if (fsp->fd != -1)
 			SMB_VFS_FREMOVEXATTR(fsp, fsp->fd, SAMBA_POSIX_INHERITANCE_EA_NAME);
@@ -236,7 +236,7 @@
 		return;
 	}
 
-	pai_buf = create_pai_buf(file_ace_list, dir_ace_list, protected, &store_size);
+	pai_buf = create_pai_buf(file_ace_list, dir_ace_list, pai_protected, &store_size);
 
 	if (fsp->fd != -1)
 		ret = SMB_VFS_FSETXATTR(fsp, fsp->fd, SAMBA_POSIX_INHERITANCE_EA_NAME,
@@ -247,7 +247,7 @@
 
 	SAFE_FREE(pai_buf);
 
-	DEBUG(10,("store_inheritance_attribute:%s for file %s\n", protected ? " (protected)" : "", fsp->fsp_name));
+	DEBUG(10,("store_inheritance_attribute:%s for file %s\n", pai_protected ? " (protected)" : "", fsp->fsp_name));
 	if (ret == -1 && !no_acl_syscall_error(errno))
 		DEBUG(1,("store_inheritance_attribute: Error %s\n", strerror(errno) ));
 }
@@ -280,7 +280,7 @@
 {
 	if (!pal)
 		return False;
-	return pal->protected;
+	return pal->pai_protected;
 }
 
 /************************************************************************
@@ -352,7 +352,7 @@
 
 	memset(paiv, '\0', sizeof(struct pai_val));
 
-	paiv->protected = (CVAL(buf,PAI_FLAG_OFFSET) == PAI_ACL_FLAG_PROTECTED);
+	paiv->pai_protected = (CVAL(buf,PAI_FLAG_OFFSET) == PAI_ACL_FLAG_PROTECTED);
 
 	paiv->num_entries = SVAL(buf,PAI_NUM_ENTRIES_OFFSET);
 	paiv->num_def_entries = SVAL(buf,PAI_NUM_DEFAULT_ENTRIES_OFFSET);
@@ -360,7 +360,7 @@
 	entry_offset = buf + PAI_ENTRIES_BASE;
 
 	DEBUG(10,("create_pai_val:%s num_entries = %u, num_def_entries = %u\n",
-			paiv->protected ? " (protected)" : "", paiv->num_entries, paiv->num_def_entries ));
+			paiv->pai_protected ? " (pai_protected)" : "", paiv->num_entries, paiv->num_def_entries ));
 
 	for (i = 0; i < paiv->num_entries; i++) {
 		struct pai_entry *paie;
@@ -484,7 +484,7 @@
 
 	paiv = create_pai_val(pai_buf, ret);
 
-	if (paiv && paiv->protected)
+	if (paiv && paiv->pai_protected)
 		DEBUG(10,("load_inherited_info: ACL is protected for file %s\n", fsp->fsp_name));
 
 	SAFE_FREE(pai_buf);