denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check if ClusterIP directory could be opened before enumerating it

Browse Source
This commit is contained in:
Martin Willi
2012-02-06 10:51:39 +01:00
parent b3cbc53893
commit e5747e7a83
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/ha/ha_kernel.c
+26 -17
View File
@@ -274,11 +274,14 @@ METHOD(ha_kernel_t, activate, void,
char *file; char *file;
enumerator = enumerator_create_directory(CLUSTERIP_DIR); enumerator = enumerator_create_directory(CLUSTERIP_DIR);
while (enumerator->enumerate(enumerator, NULL, &file, NULL)) if (enumerator)
{ {
enable_disable(this, segment, file, TRUE); while (enumerator->enumerate(enumerator, NULL, &file, NULL))
{
enable_disable(this, segment, file, TRUE);
}
enumerator->destroy(enumerator);
} }
enumerator->destroy(enumerator);
} }
METHOD(ha_kernel_t, deactivate, void, METHOD(ha_kernel_t, deactivate, void,
@@ -288,11 +291,14 @@ METHOD(ha_kernel_t, deactivate, void,
char *file; char *file;
enumerator = enumerator_create_directory(CLUSTERIP_DIR); enumerator = enumerator_create_directory(CLUSTERIP_DIR);
while (enumerator->enumerate(enumerator, NULL, &file, NULL)) if (enumerator)
{ {
enable_disable(this, segment, file, FALSE); while (enumerator->enumerate(enumerator, NULL, &file, NULL))
{
enable_disable(this, segment, file, FALSE);
}
enumerator->destroy(enumerator);
} }
enumerator->destroy(enumerator);
} }
/** /**
@@ -306,23 +312,26 @@ static void disable_all(private_ha_kernel_t *this)
int i; int i;
enumerator = enumerator_create_directory(CLUSTERIP_DIR); enumerator = enumerator_create_directory(CLUSTERIP_DIR);
while (enumerator->enumerate(enumerator, NULL, &file, NULL)) if (enumerator)
{ {
if (chown(file, charon->uid, charon->gid) != 0) while (enumerator->enumerate(enumerator, NULL, &file, NULL))
{ {
DBG1(DBG_CFG, "changing ClusterIP permissions failed: %s", if (chown(file, charon->uid, charon->gid) != 0)
strerror(errno));
}
active = get_active(this, file);
for (i = 1; i <= this->count; i++)
{
if (active & SEGMENTS_BIT(i))
{ {
enable_disable(this, i, file, FALSE); DBG1(DBG_CFG, "changing ClusterIP permissions failed: %s",
strerror(errno));
}
active = get_active(this, file);
for (i = 1; i <= this->count; i++)
{
if (active & SEGMENTS_BIT(i))
{
enable_disable(this, i, file, FALSE);
}
} }
} }
enumerator->destroy(enumerator);
} }
enumerator->destroy(enumerator);
} }
METHOD(ha_kernel_t, destroy, void, METHOD(ha_kernel_t, destroy, void,