summaryrefslogtreecommitdiff
path: root/selinux
diff options
context:
space:
mode:
authorDenis Vlasenko2007-09-29 23:55:30 +0000
committerDenis Vlasenko2007-09-29 23:55:30 +0000
commit43f0a0bb3a178794ac9fa3f5010db680c5d1b018 (patch)
tree7f3c2fae714d8260c100fbad6627c7ae4e8c43fe /selinux
parente755e827f7c8ecb21787a4369d7afdeda54d112b (diff)
downloadbusybox-43f0a0bb3a178794ac9fa3f5010db680c5d1b018.zip
busybox-43f0a0bb3a178794ac9fa3f5010db680c5d1b018.tar.gz
apply all post-1.7.1 patches, set version to 1.7.21_7_2
Diffstat (limited to 'selinux')
-rw-r--r--selinux/chcon.c2
-rw-r--r--selinux/setfiles.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/selinux/chcon.c b/selinux/chcon.c
index f0590b5..3609880 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -136,7 +136,7 @@ int chcon_main(int argc, char **argv)
":\xff--urtl:u--\xff:r--\xff:t--\xff:l--\xff"
#endif
":f--v:v--f"; /* 'verbose' and 'quiet' are exclusive */
- getopt32(argv, "Rchf:u:r:t:l:v",
+ getopt32(argv, "Rchfu:r:t:l:v",
&user, &role, &type, &range, &reference_file);
argv += optind;
diff --git a/selinux/setfiles.c b/selinux/setfiles.c
index 174d4ce..c3775cd 100644
--- a/selinux/setfiles.c
+++ b/selinux/setfiles.c
@@ -189,7 +189,7 @@ static int match(const char *name, struct stat *sb, char **con)
file_sep = strrchr(tmp_path, '/');
if (file_sep == tmp_path) {
file_sep++;
- p[0] = '\0';
+ path[0] = '\0';
p = path;
} else if (file_sep) {
*file_sep++ = '\0';