External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-14 23:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable nwfilter driver when running unprivileged

Browse Source 
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)

Conflicts:
	src/nwfilter/nwfilter_driver.c
(da77f04 Convert HAVE_DBUS to WITH_DBUS not backported)
This commit is contained in:
Ján Tomko 2013-11-12 13:18:54 +01:00
parent 6cfc7a5d09
commit 56222e0428
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nwfilter/nwfilter_driver.c
View File

@ -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)