diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:19:57 +1000 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:19:57 +1000 |
| commit | ec71cb6575290eb6ad716e4f620db445d8e1bcd3 (patch) | |
| tree | 219a5dba000e0ad98ff563bc6f7d45d274d3a178 /selinux | |
| parent | b5139d7cd8982d9b683cb1babf0bd759076aaab0 (diff) | |
| parent | 6814cbc9288601840aedb372e2bd84dab76ffa43 (diff) | |
| download | busybox-w32-ec71cb6575290eb6ad716e4f620db445d8e1bcd3.tar.gz busybox-w32-ec71cb6575290eb6ad716e4f620db445d8e1bcd3.tar.bz2 busybox-w32-ec71cb6575290eb6ad716e4f620db445d8e1bcd3.zip | |
Merge branch 'origin/master' (early part)
Diffstat (limited to 'selinux')
| -rw-r--r-- | selinux/Config.src | 1 | ||||
| -rw-r--r-- | selinux/setfiles.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/selinux/Config.src b/selinux/Config.src index 64a99203e..47d15b6af 100644 --- a/selinux/Config.src +++ b/selinux/Config.src | |||
| @@ -122,4 +122,3 @@ config SESTATUS | |||
| 122 | Displays the status of SELinux. | 122 | Displays the status of SELinux. |
| 123 | 123 | ||
| 124 | endmenu | 124 | endmenu |
| 125 | |||
diff --git a/selinux/setfiles.c b/selinux/setfiles.c index f45e41b2b..989510e3d 100644 --- a/selinux/setfiles.c +++ b/selinux/setfiles.c | |||
| @@ -118,7 +118,6 @@ static void add_exclude(const char *directory) | |||
| 118 | 118 | ||
| 119 | if (directory == NULL || directory[0] != '/') { | 119 | if (directory == NULL || directory[0] != '/') { |
| 120 | bb_error_msg_and_die("full path required for exclude: %s", directory); | 120 | bb_error_msg_and_die("full path required for exclude: %s", directory); |
| 121 | |||
| 122 | } | 121 | } |
| 123 | if (lstat(directory, &sb)) { | 122 | if (lstat(directory, &sb)) { |
| 124 | bb_error_msg("directory \"%s\" not found, ignoring", directory); | 123 | bb_error_msg("directory \"%s\" not found, ignoring", directory); |