Changeset 221 for branches/samba-3.3.x/source/smbd/posix_acls.c

Timestamp:

May 24, 2009, 7:17:10 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

File:

• branches/samba-3.3.x/source/smbd/posix_acls.c (modified) (18 diffs)

branches/samba-3.3.x/source/smbd/posix_acls.c

@@ -564 +564 @@
 ****************************************************************************/
 
-static size_t count_canon_ace_list( canon_ace *list_head )
+static size_t count_canon_ace_list( canon_ace *l_head )
 {
         size_t count = 0;
         canon_ace *ace;
 
-        for (ace = list_head; ace; ace = ace->next)
+        for (ace = l_head; ace; ace = ace->next)
                 count++;
 
@@ -579 +579 @@
 ****************************************************************************/
 
-static void free_canon_ace_list( canon_ace *list_head )
+static void free_canon_ace_list( canon_ace *l_head )
 {
         canon_ace *list, *next;
 
-        for (list = list_head; list; list = next) {
+        for (list = l_head; list; list = next) {
                 next = list->next;
-                DLIST_REMOVE(list_head, list);
+                DLIST_REMOVE(l_head, list);
                 SAFE_FREE(list);
         }
@@ -761 +761 @@
 static void merge_aces( canon_ace **pp_list_head )
 {
-        canon_ace *list_head = *pp_list_head;
+        canon_ace *l_head = *pp_list_head;
         canon_ace *curr_ace_outer;
         canon_ace *curr_ace_outer_next;
@@ -770 +770 @@
          */
 
-        for (curr_ace_outer = list_head; curr_ace_outer; curr_ace_outer = curr_ace_outer_next) {
+        for (curr_ace_outer = l_head; curr_ace_outer; curr_ace_outer = curr_ace_outer_next) {
                 canon_ace *curr_ace;
                 canon_ace *curr_ace_next;
@@ -792 +792 @@
 
                                 curr_ace_outer->perms |= curr_ace->perms;
-                                DLIST_REMOVE(list_head, curr_ace);
+                                DLIST_REMOVE(l_head, curr_ace);
                                 SAFE_FREE(curr_ace);
                                 curr_ace_outer_next = curr_ace_outer->next; /* We may have deleted the link. */
@@ -805 +805 @@
          */
 
-        for (curr_ace_outer = list_head; curr_ace_outer; curr_ace_outer = curr_ace_outer_next) {
+        for (curr_ace_outer = l_head; curr_ace_outer; curr_ace_outer = curr_ace_outer_next) {
                 canon_ace *curr_ace;
                 canon_ace *curr_ace_next;
@@ -837 +837 @@
                                          */
 
-                                        DLIST_REMOVE(list_head, curr_ace);
+                                        DLIST_REMOVE(l_head, curr_ace);
                                         SAFE_FREE(curr_ace);
                                         curr_ace_outer_next = curr_ace_outer->next; /* We may have deleted the link. */
@@ -853 +853 @@
                                          */
 
-                                        DLIST_REMOVE(list_head, curr_ace_outer);
+                                        DLIST_REMOVE(l_head, curr_ace_outer);
                                         SAFE_FREE(curr_ace_outer);
                                         break;
@@ -864 +864 @@
         /* We may have modified the list. */
 
-        *pp_list_head = list_head;
+        *pp_list_head = l_head;
 }
 
@@ -2148 +2148 @@
 static void arrange_posix_perms(const char *filename, canon_ace **pp_list_head)
 {
-        canon_ace *list_head = *pp_list_head;
+        canon_ace *l_head = *pp_list_head;
         canon_ace *owner_ace = NULL;
         canon_ace *other_ace = NULL;
         canon_ace *ace = NULL;
 
-        for (ace = list_head; ace; ace = ace->next) {
+        for (ace = l_head; ace; ace = ace->next) {
                 if (ace->type == SMB_ACL_USER_OBJ)
                         owner_ace = ace;
@@ -2174 +2174 @@
 
         if (owner_ace) {
-                DLIST_PROMOTE(list_head, owner_ace);
+                DLIST_PROMOTE(l_head, owner_ace);
         }
 
         if (other_ace) {
-                DLIST_DEMOTE(list_head, other_ace, canon_ace *);
+                DLIST_DEMOTE(l_head, other_ace, canon_ace *);
         }
 
         /* We have probably changed the head of the list. */
 
-        *pp_list_head = list_head;
+        *pp_list_head = l_head;
 }
                 
@@ -2196 +2196 @@
 {
         mode_t acl_mask = (S_IRUSR|S_IWUSR|S_IXUSR);
-        canon_ace *list_head = NULL;
+        canon_ace *l_head = NULL;
         canon_ace *ace = NULL;
         canon_ace *next_ace = NULL;
@@ -2300 +2300 @@
                 ace->inherited = get_inherited_flag(pal, ace, (the_acl_type == SMB_ACL_TYPE_DEFAULT));
 
-                DLIST_ADD(list_head, ace);
+                DLIST_ADD(l_head, ace);
         }
 
@@ -2307 +2307 @@
          */
 
-        if (!ensure_canon_entry_valid(&list_head, conn->params,
+        if (!ensure_canon_entry_valid(&l_head, conn->params,
                                       S_ISDIR(psbuf->st_mode), powner, pgroup,
                                       psbuf, False))
@@ -2319 +2319 @@
         DEBUG(10,("canonicalise_acl: %s ace entries before arrange :\n", the_acl_type == SMB_ACL_TYPE_ACCESS ? "Access" : "Default" ));
 
-        for ( ace_count = 0, ace = list_head; ace; ace = next_ace, ace_count++) {
+        for ( ace_count = 0, ace = l_head; ace; ace = next_ace, ace_count++) {
                 next_ace = ace->next;
 
@@ -2327 +2327 @@
 
                 if (ace->perms == 0) {
-                        DLIST_PROMOTE(list_head, ace);
+                        DLIST_PROMOTE(l_head, ace);
                 }
 
@@ -2335 +2335 @@
         }
 
-        arrange_posix_perms(fname,&list_head );
-
-        print_canon_ace_list( "canonicalise_acl: ace entries after arrange", list_head );
-
-        return list_head;
+        arrange_posix_perms(fname,&l_head );
+
+        print_canon_ace_list( "canonicalise_acl: ace entries after arrange", l_head );
+
+        return l_head;
 
   fail:
 
-        free_canon_ace_list(list_head);
+        free_canon_ace_list(l_head);
         return NULL;
 }
@@ -4046 +4046 @@
         SMB_ACL_T def_acl = NULL;
 
-        if (num_def_acls && !S_ISDIR(psbuf->st_mode)) {
-                DEBUG(5,("set_unix_posix_default_acl: Can't set default ACL on non-directory file %s\n", fname ));
-                errno = EISDIR;
-                return False;
+        if (!S_ISDIR(psbuf->st_mode)) {
+                if (num_def_acls) {
+                        DEBUG(5,("set_unix_posix_default_acl: Can't set default ACL on non-directory file %s\n", fname ));
+                        errno = EISDIR;
+                        return False;
+                } else {
+                        return True;
+                }
         }