mirror of
				https://gitlab.com/libvirt/libvirt.git
				synced 2025-11-03 08:24:18 +03:00 
			
		
		
		
	Revert "security_manager: Load lock plugin on init"
This reverts commit 3e26b476b5.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
			
			
This commit is contained in:
		@@ -2624,8 +2624,7 @@ int main(int argc, char *argv[])
 | 
			
		||||
    ctrl->handshakeFd = handshakeFd;
 | 
			
		||||
 | 
			
		||||
    if (!(ctrl->securityManager = virSecurityManagerNew(securityDriver,
 | 
			
		||||
                                                        LXC_DRIVER_NAME,
 | 
			
		||||
                                                        NULL, 0)))
 | 
			
		||||
                                                        LXC_DRIVER_NAME, 0)))
 | 
			
		||||
        goto cleanup;
 | 
			
		||||
 | 
			
		||||
    if (ctrl->def->seclabels) {
 | 
			
		||||
 
 | 
			
		||||
@@ -1531,7 +1531,7 @@ lxcSecurityInit(virLXCDriverConfigPtr cfg)
 | 
			
		||||
        flags |= VIR_SECURITY_MANAGER_REQUIRE_CONFINED;
 | 
			
		||||
 | 
			
		||||
    virSecurityManagerPtr mgr = virSecurityManagerNew(cfg->securityDriverName,
 | 
			
		||||
                                                      LXC_DRIVER_NAME, NULL, flags);
 | 
			
		||||
                                                      LXC_DRIVER_NAME, flags);
 | 
			
		||||
    if (!mgr)
 | 
			
		||||
        goto error;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user