diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-01-31 14:24:29 +0000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-01-31 14:24:29 +0000 |
| commit | 774e2600c8b332679ee2fa254eb02ad6831cf736 (patch) | |
| tree | 6384e3e514bb6e7c4a5c6680adb4dd4ef1fbb057 | |
| parent | 3a0a2512064a4fa176c002c45e9d9e7e56acccc9 (diff) | |
| download | attr-774e2600c8b332679ee2fa254eb02ad6831cf736.tar.gz | |
Minor updates - spec file usr/grp fixups on install, double-free cleanup in libattr for non-alloca platforms.
Merge of master-melb:xfs-cmds:25070a by kenmcd.
| -rw-r--r-- | build/rpm/attr.spec.in | 3 | ||||
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | libattr/attr_copy_fd.c | 1 | ||||
| -rw-r--r-- | libattr/attr_copy_file.c | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/build/rpm/attr.spec.in b/build/rpm/attr.spec.in index bd39896..493b881 100644 --- a/build/rpm/attr.spec.in +++ b/build/rpm/attr.spec.in @@ -55,6 +55,9 @@ if [ -f .census ] ; then fi else %setup +INSTALL_USER=root +INSTALL_GROUP=root +export INSTALL_USER INSTALL_GROUP @make@ configure fi diff --git a/doc/CHANGES b/doc/CHANGES index 966e571..bf54ed0 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,6 +1,9 @@ attr-2.4.29 (31 January 2006) - Updated Polish translation. Thanks to Jakub Bogusz <qboosh@pld-linux.org> for this. + - Fixed rpm specfile with respect to INSTALL_{USER,GROUP}. + - Fixed a couple of double frees in libattr attr copy + routines, thanks to Andreas. attr-2.4.28 (13 January 2006) - Implement the IRIX list_attr interfaces in libattr.so, diff --git a/libattr/attr_copy_fd.c b/libattr/attr_copy_fd.c index 17b87d8..4c90a96 100644 --- a/libattr/attr_copy_fd.c +++ b/libattr/attr_copy_fd.c @@ -96,7 +96,6 @@ attr_copy_fd(const char *src_path, int src_fd, const char *qpath = quote (ctx, src_path); error (ctx, _("listing attributes of %s"), qpath); quote_free (ctx, qpath); - my_free (names); ret = -1; goto getout; } else { diff --git a/libattr/attr_copy_file.c b/libattr/attr_copy_file.c index 0dbdd98..5bfa86a 100644 --- a/libattr/attr_copy_file.c +++ b/libattr/attr_copy_file.c @@ -94,7 +94,6 @@ attr_copy_file(const char *src_path, const char *dst_path, const char *qpath = quote (ctx, src_path); error (ctx, _("listing attributes of %s"), qpath); quote_free (ctx, qpath); - my_free (names); ret = -1; goto getout; } else { |