External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 07:05:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid warnings from nwfilter driver when run non-root

Browse Source 
When run non-root the nwfilter driver logs error messages about
being unable to find iptables/ebtables commands (they are in
/sbin which isn't in $PATH). The nwfilter driver can't ever work
as non-root, so simply skip it entirely thus avoiding the error
messages

* src/conf/nwfilter_conf.h, src/nwfilter/nwfilter_driver.c,
  src/nwfilter/nwfilter_gentech_driver.c,
  src/nwfilter/nwfilter_gentech_driver.h: Pass 'bool privileged'
  flag down to final driver impl
* src/nwfilter/nwfilter_ebiptables_driver.c: Skip initialization
  if not privileged
This commit is contained in:
Daniel P. Berrange 2011-02-10 10:46:21 +00:00
parent 10713b1b98
commit 525434dd60
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/nwfilter_conf.h
View File

@ -502,7 +502,7 @@ struct domUpdateCBStruct {
}; };
typedef int (*virNWFilterTechDrvInit)(void); typedef int (*virNWFilterTechDrvInit)(bool privileged);
typedef void (*virNWFilterTechDrvShutdown)(void); typedef void (*virNWFilterTechDrvShutdown)(void);
enum virDomainNetType; enum virDomainNetType;

2
src/nwfilter/nwfilter_driver.c
View File

@ -69,7 +69,7 @@ nwfilterDriverStartup(int privileged) {
if (virNWFilterLearnInit() < 0) if (virNWFilterLearnInit() < 0)
return -1; return -1;
virNWFilterTechDriversInit(); virNWFilterTechDriversInit(privileged);
if (virNWFilterConfLayerInit(virNWFilterDomainFWUpdateCB) < 0) if (virNWFilterConfLayerInit(virNWFilterDomainFWUpdateCB) < 0)
goto conf_init_err; goto conf_init_err;

9
src/nwfilter/nwfilter_ebiptables_driver.c
View File

@ -114,7 +114,7 @@ static const char *m_physdev_out_str = "-m physdev " PHYSDEV_OUT;
#define COMMENT_VARNAME "comment" #define COMMENT_VARNAME "comment"
static int ebtablesRemoveBasicRules(const char *ifname); static int ebtablesRemoveBasicRules(const char *ifname);
static int ebiptablesDriverInit(void); static int ebiptablesDriverInit(bool privileged);
static void ebiptablesDriverShutdown(void); static void ebiptablesDriverShutdown(void);
static int ebtablesCleanAll(const char *ifname); static int ebtablesCleanAll(const char *ifname);
static int ebiptablesAllTeardown(const char *ifname); static int ebiptablesAllTeardown(const char *ifname);
@ -3653,11 +3653,14 @@ virNWFilterTechDriver ebiptables_driver = {
static int static int
ebiptablesDriverInit(void) ebiptablesDriverInit(bool privileged)
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
int cli_status; int cli_status;
if (!privileged)
return 0;
if (virMutexInit(&execCLIMutex)) if (virMutexInit(&execCLIMutex))
return EINVAL; return EINVAL;
@ -3730,7 +3733,7 @@ ebiptablesDriverInit(void)
static void static void
ebiptablesDriverShutdown() ebiptablesDriverShutdown(void)
{ {
VIR_FREE(gawk_cmd_path); VIR_FREE(gawk_cmd_path);
VIR_FREE(grep_cmd_path); VIR_FREE(grep_cmd_path);

6
src/nwfilter/nwfilter_gentech_driver.c
View File

@ -50,17 +50,17 @@ static virNWFilterTechDriverPtr filter_tech_drivers[] = {
}; };
void virNWFilterTechDriversInit() { void virNWFilterTechDriversInit(bool privileged) {
int i = 0; int i = 0;
while (filter_tech_drivers[i]) { while (filter_tech_drivers[i]) {
if (!(filter_tech_drivers[i]->flags & TECHDRV_FLAG_INITIALIZED)) if (!(filter_tech_drivers[i]->flags & TECHDRV_FLAG_INITIALIZED))
filter_tech_drivers[i]->init(); filter_tech_drivers[i]->init(privileged);
i++; i++;
} }
} }
void virNWFilterTechDriversShutdown() { void virNWFilterTechDriversShutdown(void) {
int i = 0; int i = 0;
while (filter_tech_drivers[i]) { while (filter_tech_drivers[i]) {
if ((filter_tech_drivers[i]->flags & TECHDRV_FLAG_INITIALIZED)) if ((filter_tech_drivers[i]->flags & TECHDRV_FLAG_INITIALIZED))

2
src/nwfilter/nwfilter_gentech_driver.h
View File

@ -28,7 +28,7 @@ virNWFilterTechDriverPtr virNWFilterTechDriverForName(const char *name);
int virNWFilterRuleInstAddData(virNWFilterRuleInstPtr res, int virNWFilterRuleInstAddData(virNWFilterRuleInstPtr res,
void *data); void *data);
void virNWFilterTechDriversInit(void); void virNWFilterTechDriversInit(bool privileged);
void virNWFilterTechDriversShutdown(void); void virNWFilterTechDriversShutdown(void);
enum instCase { enum instCase {