mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-31 18:15:25 +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 commitb7829f959b
) Conflicts: src/nwfilter/nwfilter_driver.c (da77f04
Convert HAVE_DBUS to WITH_DBUS not backported)
This commit is contained in:
parent
6cfc7a5d09
commit
56222e0428
@ -170,6 +170,9 @@ nwfilterDriverStartup(int privileged)
|
||||
char *base = NULL;
|
||||
DBusConnection *sysbus = NULL;
|
||||
|
||||
if (!privileged)
|
||||
return 0;
|
||||
|
||||
#if HAVE_DBUS
|
||||
sysbus = virDBusGetSystemBus();
|
||||
#endif /* HAVE_DBUS */
|
||||
@ -185,9 +188,6 @@ nwfilterDriverStartup(int privileged)
|
||||
driverState->watchingFirewallD = (sysbus != NULL);
|
||||
driverState->privileged = privileged;
|
||||
|
||||
if (!privileged)
|
||||
return 0;
|
||||
|
||||
nwfilterDriverLock(driverState);
|
||||
|
||||
if (virNWFilterIPAddrMapInit() < 0)
|
||||
|
Loading…
Reference in New Issue
Block a user