Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
iSulad
提交
d8644267
I
iSulad
项目概览
openeuler
/
iSulad
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
iSulad
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d8644267
编写于
2月 21, 2020
作者:
O
openeuler-ci-bot
提交者:
Gitee
2月 21, 2020
浏览文件
操作
浏览文件
下载
差异文件
!60 adapt to lower version of gcc
Merge pull request !60 from JingWoo/gcc
上级
3ac53966
2d2979e9
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
9 addition
and
2 deletion
+9
-2
src/services/execution/spec/selinux_label.c
src/services/execution/spec/selinux_label.c
+4
-2
test/cmd/isula/infomation/info/CMakeLists.txt
test/cmd/isula/infomation/info/CMakeLists.txt
+1
-0
test/image/oci/oci_config_merge/CMakeLists.txt
test/image/oci/oci_config_merge/CMakeLists.txt
+1
-0
test/runtime/lcr/CMakeLists.txt
test/runtime/lcr/CMakeLists.txt
+1
-0
test/specs/specs/CMakeLists.txt
test/specs/specs/CMakeLists.txt
+2
-0
未找到文件。
src/services/execution/spec/selinux_label.c
浏览文件 @
d8644267
...
...
@@ -632,9 +632,10 @@ out:
static
bool
valid_options
(
const
char
*
opt
)
{
size_t
i
;
const
char
*
opts
[]
=
{
"disable"
,
"type"
,
"user"
,
"role"
,
"level"
};
for
(
size_t
i
=
0
;
i
<
sizeof
(
opts
)
/
sizeof
(
char
*
);
i
++
)
{
for
(
i
=
0
;
i
<
sizeof
(
opts
)
/
sizeof
(
char
*
);
i
++
)
{
if
(
strcmp
(
opt
,
opts
[
i
])
==
0
)
{
return
true
;
}
...
...
@@ -768,9 +769,10 @@ int init_label(const char **label_opts, size_t label_opts_len, char **dst_proces
}
if
(
process_label
!=
NULL
)
{
size_t
i
;
pcon
=
context_new
(
process_label
);
mcon
=
context_new
(
mount_label
);
for
(
size_t
i
=
0
;
i
<
label_opts_len
;
i
++
)
{
for
(
i
=
0
;
i
<
label_opts_len
;
i
++
)
{
if
(
strcmp
(
label_opts
[
i
],
"disable"
)
==
0
)
{
goto
out
;
}
...
...
test/cmd/isula/infomation/info/CMakeLists.txt
浏览文件 @
d8644267
...
...
@@ -11,6 +11,7 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils_convert.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils_verify.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils_regex.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/util_atomic.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/sha256/sha256.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/path.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/commander.c
...
...
test/image/oci/oci_config_merge/CMakeLists.txt
浏览文件 @
d8644267
...
...
@@ -11,6 +11,7 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cutils/utils_string.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cutils/utils_convert.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cutils/utils_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cutils/util_atomic.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/sha256/sha256.c
${
CMAKE_BINARY_DIR
}
/json/json_common.c
...
...
test/runtime/lcr/CMakeLists.txt
浏览文件 @
d8644267
...
...
@@ -10,6 +10,7 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_string.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_convert.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/util_atomic.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/sha256/sha256.c
${
CMAKE_BINARY_DIR
}
/json/json_common.c
...
...
test/specs/specs/CMakeLists.txt
浏览文件 @
d8644267
...
...
@@ -10,6 +10,7 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_string.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_convert.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/util_atomic.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/sha256/sha256.c
${
CMAKE_BINARY_DIR
}
/json/json_common.c
...
...
@@ -37,6 +38,7 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/namespace_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/container_unix_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/engine_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/selinux_label_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/isulad_config_mock.cc
${
CMAKE_BINARY_DIR
}
/json/imagetool_image.c
${
CMAKE_BINARY_DIR
}
/json/oci_image_spec.c
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录