External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 14:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move security manager into virLXCControllerPtr object

Browse Source 
Move the security manager object into the virLXCControllerPtr
object. Also simplify the code creating it in the first place

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2012-07-03 13:59:36 +01:00
parent 37441d89d5
commit 25aa053282
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/lxc/lxc_controller.c
View File

@ -122,6 +122,8 @@ struct _virLXCController {
size_t nloopDevs;
int *loopDevFds;
virSecurityManagerPtr securityManager;
};
static void virLXCControllerFree(virLXCControllerPtr ctrl);
@ -222,6 +224,8 @@ static void virLXCControllerFree(virLXCControllerPtr ctrl)
virLXCControllerStopInit(ctrl);
virSecurityManagerFree(ctrl->securityManager);
for (i = 0 ; i < ctrl->nveths ; i++)
VIR_FREE(ctrl->veths[i]);
VIR_FREE(ctrl->veths);
@ -1544,7 +1548,6 @@ cleanup:
static int
virLXCControllerRun(virLXCControllerPtr ctrl,
virSecurityManagerPtr securityDriver,
int monitor,
int client)
{
@ -1604,7 +1607,8 @@ virLXCControllerRun(virLXCControllerPtr ctrl,
* marked as shared
*/
if (root) {
mount_options = virSecurityManagerGetMountOptions(securityDriver, ctrl->def);
mount_options = virSecurityManagerGetMountOptions(ctrl->securityManager,
ctrl->def);
char *opts;
VIR_DEBUG("Setting up private /dev/pts");
@ -1698,7 +1702,7 @@ virLXCControllerRun(virLXCControllerPtr ctrl,
goto cleanup;
if ((ctrl->initpid = lxcContainerStart(ctrl->def,
securityDriver,
ctrl->securityManager,
ctrl->nveths,
ctrl->veths,
control[1],
@ -1793,9 +1797,9 @@ int main(int argc, char *argv[])
};
int *ttyFDs = NULL;
size_t nttyFDs = 0;
virSecurityManagerPtr securityDriver = NULL;
virLXCControllerPtr ctrl = NULL;
size_t i;
const char *securityDriver = "none";
if (setlocale(LC_ALL, "") == NULL ||
bindtextdomain(PACKAGE, LOCALEDIR) == NULL ||
@ -1860,13 +1864,7 @@ int main(int argc, char *argv[])
break;
case 'S':
if (!(securityDriver = virSecurityManagerNew(optarg,
LXC_DRIVER_NAME,
false, false, false))) {
fprintf(stderr, "Cannot create security manager '%s'",
optarg);
goto cleanup;
}
securityDriver = optarg;
break;
case 'h':
@ -1888,16 +1886,6 @@ int main(int argc, char *argv[])
}
}
if (securityDriver == NULL) {
if (!(securityDriver = virSecurityManagerNew("none",
LXC_DRIVER_NAME,
false, false, false))) {
fprintf(stderr, "%s: cannot initialize nop security manager", argv[0]);
goto cleanup;
}
}
if (name == NULL) {
fprintf(stderr, "%s: missing --name argument for configuration\n", argv[0]);
goto cleanup;
@ -1921,6 +1909,11 @@ int main(int argc, char *argv[])
ctrl->handshakeFd = handshakeFd;
if (!(ctrl->securityManager = virSecurityManagerNew(securityDriver,
LXC_DRIVER_NAME,
false, false, false)))
goto cleanup;
VIR_DEBUG("Security model %s type %s label %s imagelabel %s",
NULLSTR(ctrl->def->seclabel.model),
virDomainSeclabelTypeToString(ctrl->def->seclabel.type),
@ -1987,7 +1980,7 @@ int main(int argc, char *argv[])
goto cleanup;
}
rc = virLXCControllerRun(ctrl, securityDriver,
rc = virLXCControllerRun(ctrl,
monitor, client);
cleanup: