提交 885ac290 编写于 作者: E Eric Blake

util: don't support loopback and nbd when setuid

The only remaining reason that virt-login-shell was trying to
link against virstoragefile was because of a call to
virStorageFileFormatTypeToString when spawning a qemu-nbd
process - but setuid processes shouldn't be spawning qemu-nbd.

* src/util/virfile.c (virFileLoopDeviceAssociate)
(virFileNBDDeviceAssociate): Cripple in setuid builds.
* src/Makefile.am (libvirt_setuid_rpc_client_la_SOURCES):
Drop virstoragefile from the list.
Signed-off-by: NEric Blake <eblake@redhat.com>
上级 5160ab79
......@@ -2069,7 +2069,6 @@ libvirt_setuid_rpc_client_la_SOURCES = \
util/virprocess.c \
util/virrandom.c \
util/virsocketaddr.c \
util/virstoragefile.c \
util/virstring.c \
util/virtime.c \
util/virthread.c \
......
......@@ -540,7 +540,8 @@ int virFileUpdatePerm(const char *path,
}
#if defined(__linux__) && HAVE_DECL_LO_FLAGS_AUTOCLEAR
#if defined(__linux__) && HAVE_DECL_LO_FLAGS_AUTOCLEAR && \
!defined(LIBVIRT_SETUID_RPC_CLIENT)
# if HAVE_DECL_LOOP_CTL_GET_FREE
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册