diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-29 23:55:30 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-09-29 23:55:30 +0000 |
| commit | 43f0a0bb3a178794ac9fa3f5010db680c5d1b018 (patch) | |
| tree | 7f3c2fae714d8260c100fbad6627c7ae4e8c43fe /selinux | |
| parent | e755e827f7c8ecb21787a4369d7afdeda54d112b (diff) | |
| download | busybox-w32-1_7_2.tar.gz busybox-w32-1_7_2.tar.bz2 busybox-w32-1_7_2.zip | |
apply all post-1.7.1 patches, set version to 1.7.21_7_2
Diffstat (limited to 'selinux')
| -rw-r--r-- | selinux/chcon.c | 2 | ||||
| -rw-r--r-- | selinux/setfiles.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/selinux/chcon.c b/selinux/chcon.c index f0590b5b0..3609880cb 100644 --- a/selinux/chcon.c +++ b/selinux/chcon.c | |||
| @@ -136,7 +136,7 @@ int chcon_main(int argc, char **argv) | |||
| 136 | ":\xff--urtl:u--\xff:r--\xff:t--\xff:l--\xff" | 136 | ":\xff--urtl:u--\xff:r--\xff:t--\xff:l--\xff" |
| 137 | #endif | 137 | #endif |
| 138 | ":f--v:v--f"; /* 'verbose' and 'quiet' are exclusive */ | 138 | ":f--v:v--f"; /* 'verbose' and 'quiet' are exclusive */ |
| 139 | getopt32(argv, "Rchf:u:r:t:l:v", | 139 | getopt32(argv, "Rchfu:r:t:l:v", |
| 140 | &user, &role, &type, &range, &reference_file); | 140 | &user, &role, &type, &range, &reference_file); |
| 141 | argv += optind; | 141 | argv += optind; |
| 142 | 142 | ||
diff --git a/selinux/setfiles.c b/selinux/setfiles.c index 174d4ce60..c3775cd90 100644 --- a/selinux/setfiles.c +++ b/selinux/setfiles.c | |||
| @@ -189,7 +189,7 @@ static int match(const char *name, struct stat *sb, char **con) | |||
| 189 | file_sep = strrchr(tmp_path, '/'); | 189 | file_sep = strrchr(tmp_path, '/'); |
| 190 | if (file_sep == tmp_path) { | 190 | if (file_sep == tmp_path) { |
| 191 | file_sep++; | 191 | file_sep++; |
| 192 | p[0] = '\0'; | 192 | path[0] = '\0'; |
| 193 | p = path; | 193 | p = path; |
| 194 | } else if (file_sep) { | 194 | } else if (file_sep) { |
| 195 | *file_sep++ = '\0'; | 195 | *file_sep++ = '\0'; |