Allow $RSYNC_TEST_TMP to indicate a good tmp dir for our tests.

[rsync/rsync.git] / acls.c

diff --git a/acls.c b/acls.c
index 3670a4d..dc80dce 100644 (file)
--- a/acls.c
+++ b/acls.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2006 Wayne Davison
+ * Copyright (C) 2006-2009 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -101,6 +101,8 @@ static const char *str_acl_type(SMB_ACL_TYPE_T type)
 #endif
        case SMB_ACL_TYPE_DEFAULT:
                return "ACL_TYPE_DEFAULT";
+       default:
+               break;
        }
        return "unknown ACL type!";
 }
@@ -135,7 +137,8 @@ static void rsync_acl_strip_perms(rsync_acl *racl)
        else {
                if (racl->group_obj == racl->mask_obj)
                        racl->group_obj = NO_ENTRY;
-               racl->mask_obj = NO_ENTRY;
+               if (racl->names.count != 0)
+                       racl->mask_obj = NO_ENTRY;
        }
        racl->other_obj = NO_ENTRY;
 }
@@ -747,14 +750,7 @@ static int recv_rsync_acl(item_list *racl_list, SMB_ACL_TYPE_T type, int f)
        /* If we received a superfluous mask, throw it away. */
        duo_item->racl.mask_obj = NO_ENTRY;
 #else
-       if (!duo_item->racl.names.count) {
-               /* If we received a superfluous mask, throw it away. */
-               if (duo_item->racl.mask_obj != NO_ENTRY) {
-                       /* Mask off the group perms with it first. */
-                       duo_item->racl.group_obj &= duo_item->racl.mask_obj | NO_ENTRY;
-                       duo_item->racl.mask_obj = NO_ENTRY;
-               }
-       } else if (duo_item->racl.mask_obj == NO_ENTRY) /* Must be non-empty with lists. */
+       if (duo_item->racl.names.count && duo_item->racl.mask_obj == NO_ENTRY) /* Must be non-empty with lists. */
                duo_item->racl.mask_obj = (computed_mask_bits | duo_item->racl.group_obj) & ~NO_ENTRY;
 #endif
 
@@ -1079,7 +1075,7 @@ int default_perms_for_dir(const char *dir)
        /* Apply the permission-bit entries of the default ACL, if any. */
        if (racl.user_obj != NO_ENTRY) {
                perms = rsync_acl_get_perms(&racl);
-               if (verbose > 2)
+               if (DEBUG_GTE(ACL, 1))
                        rprintf(FINFO, "got ACL-based default perms %o for directory %s\n", perms, dir);
        }