diff options
| author | Ron Yorston <rmy@pobox.com> | 2015-07-14 14:12:05 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2015-07-14 14:12:05 +0100 |
| commit | 895a1533781ca4713ef92113ab6ac5f2584ddd9d (patch) | |
| tree | 49c8602e9cd733e6f6c105e94e614b8236677853 /selinux | |
| parent | 535ec990c50206697852d5c25e94a959f24d86bc (diff) | |
| parent | 072fc60f29ee3a4ff38f095a9ef149b2e820c8c0 (diff) | |
| download | busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.tar.gz busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.tar.bz2 busybox-w32-895a1533781ca4713ef92113ab6ac5f2584ddd9d.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'selinux')
| -rw-r--r-- | selinux/Config.src | 2 | ||||
| -rw-r--r-- | selinux/setfiles.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/selinux/Config.src b/selinux/Config.src index 47d15b6af..d4701f60b 100644 --- a/selinux/Config.src +++ b/selinux/Config.src | |||
| @@ -64,7 +64,7 @@ config RUNCON | |||
| 64 | default n | 64 | default n |
| 65 | depends on SELINUX | 65 | depends on SELINUX |
| 66 | help | 66 | help |
| 67 | Enable support to run command in speficied security context. | 67 | Enable support to run command in specified security context. |
| 68 | 68 | ||
| 69 | config FEATURE_RUNCON_LONG_OPTIONS | 69 | config FEATURE_RUNCON_LONG_OPTIONS |
| 70 | bool "Enable long options" | 70 | bool "Enable long options" |
diff --git a/selinux/setfiles.c b/selinux/setfiles.c index 0173db99e..c974c4a9d 100644 --- a/selinux/setfiles.c +++ b/selinux/setfiles.c | |||
| @@ -251,7 +251,6 @@ static int match(const char *name, struct stat *sb, char **con) | |||
| 251 | name = path; | 251 | name = path; |
| 252 | if (excludeCtr > 0 && exclude(name)) | 252 | if (excludeCtr > 0 && exclude(name)) |
| 253 | goto err; | 253 | goto err; |
| 254 | |||
| 255 | } else { | 254 | } else { |
| 256 | char *p; | 255 | char *p; |
| 257 | p = realpath(name, path); | 256 | p = realpath(name, path); |