bump version to 2.0.6, document recent changes.

diff --git a/VERSION b/VERSION
index a889a928be9dca823c97abff8e5b0b26c9c8809d..307cbbb4ef22be908bbd52563dfb075dcf7591af 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=0
-PKG_REVISION=5
+PKG_REVISION=6
 PKG_BUILD=0

diff --git a/debian/changelog b/debian/changelog
index 066785d6961408b261599c9680e7118a1f01190b..ee72bbc65beeeb027a371c11f1b4a31e2dcdfa0f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xfsprogs (2.0.6-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Nathan Scott <nathans@debian.org>  Thu, 30 May 2002 14:31:30 +1000
+
 xfsprogs (2.0.4-1) unstable; urgency=low
 
   * New upstream release, minor changes only

diff --git a/doc/CHANGES b/doc/CHANGES
index 30a9291a92780786a66c67bd17d33f7e52bfe952..f2780afebb5d87c3c7edc690872e5ed2f6af4804 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,23 +1,24 @@
-[cvs]
-       - Fix error returns from log recovery.
-       - Fix the way mkfs round downs the device when the last 
-         AG is maller than the minimum AG size.
+xfsprogs-2.0.6 (30 May 2002)
+       - Fix error returns from log recovery (affects xfs_repair).
+       - Fix the way mkfs.xfs round downs the device when the last 
+         AG is smaller than the minimum AG size.
        - Fix bug in xfs_repair da_write() routine, which affects
          filesystems where the data blocksize != naming blocksize
          (see xfs_info output).
        - Fix a use-after-free bug in xfs_repair code for checking
          version 1 btree-format directories.
+       - Add checks of the ACL permissions field into xfs_repair.
 
 xfsprogs-2.0.5 (02 May 2002)
-       - size AGs so that they do not always start on the same 
+       - Size AGs so that they do not always start on the same 
          part of a striped disk
        - Fix an off-by-one error on rounding down an AG that is
          too small to be an AG
-       - don't auto-grow the log to be larger than an AG
-       - change the error philosophy for -d su=,sw= away from forcing 
-         the XFS stripe size to match the XLV stripe size and instead 
-         accept, with a warning, the stripe unit & width supplied on 
-         the commandline.
+       - Don't auto-grow the log to be larger than an AG
+       - Change the error philosophy for -d su=,sw= away from forcing 
+         the XFS stripe size to match the volume manager stripe size
+         and instead accept, with a warning, the stripe unit & width
+         supplied on the commandline.
        - Update xfs_growfs man page
        - Don't build libxlog.a with DEBUG enabled
        - xfs_db fixes from ASANO Masahiro at NEC

diff --git a/repair/attr_repair.c b/repair/attr_repair.c
index d13a483be2b299619f5cf43b9d981283f9e242fb..ab3e6d1849d750d3c53230beb77107ba538c87fe 100644 (file)
--- a/repair/attr_repair.c
+++ b/repair/attr_repair.c
@@ -953,6 +953,14 @@ xfs_acl_valid(xfs_acl_t *aclp)
 
        for (i = 0; i < aclp->acl_cnt; i++) {
                entry = &aclp->acl_entry[i];
+               switch (entry->ae_perm) {
+                       case ACL_READ:
+                       case ACL_WRITE:
+                       case ACL_EXECUTE:
+                               break;
+                       default:
+                               goto acl_invalid;
+               }
                switch (entry->ae_tag) {
                        case ACL_USER_OBJ:
                                if (user++)

diff --git a/repair/attr_repair.h b/repair/attr_repair.h
index 727ec4cbdc8257a3c62b644b9138db8cf92ab053..0c4b8a7fd86c6d246ed89420f74bb3517ef8d5ec 100644 (file)
--- a/repair/attr_repair.h
+++ b/repair/attr_repair.h
@@ -39,6 +39,10 @@
 #define ACL_MASK       0x10    /* mask entry */
 #define ACL_OTHER      0x20    /* other entry */
 
+#define ACL_READ       04
+#define ACL_WRITE      02
+#define ACL_EXECUTE    01
+
 struct blkmap;
 extern int process_attributes (xfs_mount_t *, xfs_ino_t, xfs_dinode_t *,
                                struct blkmap *, int *);