External/libvirt
1
0
Fork 0
Code

security: Rename DomainSetDirLabel to DomainSetPathLabel

Browse Source 
It already labels abritrary paths, so it's just the naming that was
wrong.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Martin Kletzander 2016-04-14 09:20:55 +02:00
parent dd1400280e
commit 32f3f0835e
9 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libvirt_private.syms
View File

@ -1055,7 +1055,7 @@ virSecurityDriverLookup;
# security/security_manager.h # security/security_manager.h
virSecurityManagerCheckAllLabel; virSecurityManagerCheckAllLabel;
virSecurityManagerClearSocketLabel; virSecurityManagerClearSocketLabel;
virSecurityManagerDomainSetDirLabel; virSecurityManagerDomainSetPathLabel;
virSecurityManagerGenLabel; virSecurityManagerGenLabel;
virSecurityManagerGetBaseLabel; virSecurityManagerGetBaseLabel;
virSecurityManagerGetDOI; virSecurityManagerGetDOI;

4
src/qemu/qemu_domain.c
View File

@ -527,8 +527,8 @@ qemuDomainWriteMasterKeyFile(virQEMUDriverPtr driver,
goto cleanup; goto cleanup;
} }
if (virSecurityManagerDomainSetDirLabel(driver->securityManager, if (virSecurityManagerDomainSetPathLabel(driver->securityManager,
vm->def, path) < 0) vm->def, path) < 0)
goto cleanup; goto cleanup;
ret = 0; ret = 0;

4
src/qemu/qemu_process.c
View File

@ -4486,8 +4486,8 @@ qemuProcessMakeDir(virQEMUDriverPtr driver,
goto cleanup; goto cleanup;
} }
if (virSecurityManagerDomainSetDirLabel(driver->securityManager, if (virSecurityManagerDomainSetPathLabel(driver->securityManager,
vm->def, path) < 0) vm->def, path) < 0)
goto cleanup; goto cleanup;
ret = 0; ret = 0;

8
src/security/security_dac.c
View File

@ -1542,9 +1542,9 @@ virSecurityDACGetBaseLabel(virSecurityManagerPtr mgr,
} }
static int static int
virSecurityDACDomainSetDirLabel(virSecurityManagerPtr mgr, virSecurityDACDomainSetPathLabel(virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
const char *path) const char *path)
{ {
virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityDACDataPtr priv = virSecurityManagerGetPrivateData(mgr);
virSecurityLabelDefPtr seclabel; virSecurityLabelDefPtr seclabel;
@ -1607,5 +1607,5 @@ virSecurityDriver virSecurityDriverDAC = {
.getBaseLabel = virSecurityDACGetBaseLabel, .getBaseLabel = virSecurityDACGetBaseLabel,
.domainSetDirLabel = virSecurityDACDomainSetDirLabel, .domainSetPathLabel = virSecurityDACDomainSetPathLabel,
}; };

8
src/security/security_driver.h
View File

@ -118,9 +118,9 @@ typedef int (*virSecurityDomainSetImageLabel) (virSecurityManagerPtr mgr,
typedef int (*virSecurityDomainRestoreImageLabel) (virSecurityManagerPtr mgr, typedef int (*virSecurityDomainRestoreImageLabel) (virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
virStorageSourcePtr src); virStorageSourcePtr src);
typedef int (*virSecurityDomainSetDirLabel) (virSecurityManagerPtr mgr, typedef int (*virSecurityDomainSetPathLabel) (virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
const char *path); const char *path);
struct _virSecurityDriver { struct _virSecurityDriver {
@ -172,7 +172,7 @@ struct _virSecurityDriver {
virSecurityDriverGetBaseLabel getBaseLabel; virSecurityDriverGetBaseLabel getBaseLabel;
virSecurityDomainSetDirLabel domainSetDirLabel; virSecurityDomainSetPathLabel domainSetPathLabel;
}; };
virSecurityDriverPtr virSecurityDriverLookup(const char *name, virSecurityDriverPtr virSecurityDriverLookup(const char *name,

10
src/security/security_manager.c
View File

@ -987,14 +987,14 @@ virSecurityManagerSetHugepages(virSecurityManagerPtr mgr,
int int
virSecurityManagerDomainSetDirLabel(virSecurityManagerPtr mgr, virSecurityManagerDomainSetPathLabel(virSecurityManagerPtr mgr,
virDomainDefPtr vm, virDomainDefPtr vm,
const char *path) const char *path)
{ {
if (mgr->drv->domainSetDirLabel) { if (mgr->drv->domainSetPathLabel) {
int ret; int ret;
virObjectLock(mgr); virObjectLock(mgr);
ret = mgr->drv->domainSetDirLabel(mgr, vm, path); ret = mgr->drv->domainSetPathLabel(mgr, vm, path);
virObjectUnlock(mgr); virObjectUnlock(mgr);
return ret; return ret;
} }

6
src/security/security_manager.h
View File

@ -160,8 +160,8 @@ int virSecurityManagerRestoreImageLabel(virSecurityManagerPtr mgr,
virDomainDefPtr vm, virDomainDefPtr vm,
virStorageSourcePtr src); virStorageSourcePtr src);
int virSecurityManagerDomainSetDirLabel(virSecurityManagerPtr mgr, int virSecurityManagerDomainSetPathLabel(virSecurityManagerPtr mgr,
virDomainDefPtr vm, virDomainDefPtr vm,
const char *path); const char *path);
#endif /* VIR_SECURITY_MANAGER_H__ */ #endif /* VIR_SECURITY_MANAGER_H__ */

8
src/security/security_selinux.c
View File

@ -2594,9 +2594,9 @@ virSecuritySELinuxGetSecurityMountOptions(virSecurityManagerPtr mgr,
} }
static int static int
virSecuritySELinuxDomainSetDirLabel(virSecurityManagerPtr mgr, virSecuritySELinuxDomainSetPathLabel(virSecurityManagerPtr mgr,
virDomainDefPtr def, virDomainDefPtr def,
const char *path) const char *path)
{ {
virSecurityLabelDefPtr seclabel; virSecurityLabelDefPtr seclabel;
@ -2652,5 +2652,5 @@ virSecurityDriver virSecurityDriverSELinux = {
.domainGetSecurityMountOptions = virSecuritySELinuxGetSecurityMountOptions, .domainGetSecurityMountOptions = virSecuritySELinuxGetSecurityMountOptions,
.getBaseLabel = virSecuritySELinuxGetBaseLabel, .getBaseLabel = virSecuritySELinuxGetBaseLabel,
.domainSetDirLabel = virSecuritySELinuxDomainSetDirLabel, .domainSetPathLabel = virSecuritySELinuxDomainSetPathLabel,
}; };

12
src/security/security_stack.c
View File

@ -600,17 +600,17 @@ virSecurityStackRestoreImageLabel(virSecurityManagerPtr mgr,
} }
static int static int
virSecurityStackDomainSetDirLabel(virSecurityManagerPtr mgr, virSecurityStackDomainSetPathLabel(virSecurityManagerPtr mgr,
virDomainDefPtr vm, virDomainDefPtr vm,
const char *path) const char *path)
{ {
virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr); virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr);
virSecurityStackItemPtr item = priv->itemsHead; virSecurityStackItemPtr item = priv->itemsHead;
int rc = 0; int rc = 0;
for (; item; item = item->next) { for (; item; item = item->next) {
if (virSecurityManagerDomainSetDirLabel(item->securityManager, if (virSecurityManagerDomainSetPathLabel(item->securityManager,
vm, path) < 0) vm, path) < 0)
rc = -1; rc = -1;
} }
@ -667,5 +667,5 @@ virSecurityDriver virSecurityDriverStack = {
.getBaseLabel = virSecurityStackGetBaseLabel, .getBaseLabel = virSecurityStackGetBaseLabel,
.domainSetDirLabel = virSecurityStackDomainSetDirLabel, .domainSetPathLabel = virSecurityStackDomainSetPathLabel,
}; };