mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-08 12:41:29 +00:00
Disable nwfilter driver when running unprivileged
When opening a new connection to the driver, nwfilterOpen only succeeds if the driverState has been allocated. Move the privilege check in driver initialization before the state allocation to disable the driver. This changes the nwfilter-define error from: error: cannot create config directory (null): Bad address To: this function is not supported by the connection driver: virNWFilterDefineXML https://bugzilla.redhat.com/show_bug.cgi?id=1029266 (cherry picked from commit b7829f959b33c6e32422222a9ed745c0da7dc696)
This commit is contained in:
parent
a0e5e40501
commit
d3334a534f
@ -174,6 +174,9 @@ nwfilterStateInitialize(bool privileged,
|
||||
char *base = NULL;
|
||||
DBusConnection *sysbus = NULL;
|
||||
|
||||
if (!privileged)
|
||||
return 0;
|
||||
|
||||
#if WITH_DBUS
|
||||
sysbus = virDBusGetSystemBus();
|
||||
#endif /* WITH_DBUS */
|
||||
@ -189,9 +192,6 @@ nwfilterStateInitialize(bool privileged,
|
||||
driverState->watchingFirewallD = (sysbus != NULL);
|
||||
driverState->privileged = privileged;
|
||||
|
||||
if (!privileged)
|
||||
return 0;
|
||||
|
||||
nwfilterDriverLock(driverState);
|
||||
|
||||
if (virNWFilterIPAddrMapInit() < 0)
|
||||
|
Loading…
x
Reference in New Issue
Block a user