aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-04-08 10:58:00 +0300
committerTimo Teräs <timo.teras@iki.fi>2015-04-08 10:58:00 +0300
commit941fc1b10c00e904fb9fbd7b82e61f8f12e210bb (patch)
treedb434a27ee4446d6b27fbce7566ee2706dbe5cba
parent83ab02230115eab725bf92f111f4a3f2a41db5b1 (diff)
downloadapk-tools-941fc1b10c00e904fb9fbd7b82e61f8f12e210bb.tar.gz
apk-tools-941fc1b10c00e904fb9fbd7b82e61f8f12e210bb.tar.bz2
apk-tools-941fc1b10c00e904fb9fbd7b82e61f8f12e210bb.tar.xz
make default dir/file acl implicit
apk in alpine 3.1 already supports this optimization, but kept the database format. now is time to start using this feature.
-rw-r--r--src/database.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/database.c b/src/database.c
index 0828725..b71c9df 100644
--- a/src/database.c
+++ b/src/database.c
@@ -939,7 +939,7 @@ static int apk_db_write_fdb(struct apk_database *db, struct apk_ostream *os)
apk_blob_push_blob(&bbuf, APK_BLOB_PTR_LEN(diri->dir->name, diri->dir->namelen));
apk_blob_push_blob(&bbuf, APK_BLOB_STR("\n"));
- if (1 || diri->acl != apk_default_acl_dir)
+ if (diri->acl != apk_default_acl_dir)
apk_blob_push_db_acl(&bbuf, 'M', diri->acl);
hlist_for_each_entry(file, c2, &diri->owned_files, diri_files_list) {
@@ -947,7 +947,7 @@ static int apk_db_write_fdb(struct apk_database *db, struct apk_ostream *os)
apk_blob_push_blob(&bbuf, APK_BLOB_PTR_LEN(file->name, file->namelen));
apk_blob_push_blob(&bbuf, APK_BLOB_STR("\n"));
- if (1 || file->acl != apk_default_acl_file)
+ if (file->acl != apk_default_acl_file)
apk_blob_push_db_acl(&bbuf, 'a', file->acl);
if (file->csum.type != APK_CHECKSUM_NONE) {