vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make rehashing privset{} change online oper privileges.

Browse source 
This also fixes memory leak due to multiple privsets
with the same name (added after each rehash).
This commit is contained in:
Jilles Tjoelker 2008-12-14 18:25:15 +01:00
parent 0e52d0d4cf
commit 422bb0b553
3 changed files with 118 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/privilege.h
View file

@ -31,6 +31,7 @@ typedef enum {
} PrivilegeFlags;
struct PrivilegeSet {
unsigned int status; /* If CONF_ILLEGAL, delete when no refs */
int refs;
char *name;
char *privs;
@ -44,5 +45,7 @@ struct PrivilegeSet *privilegeset_extend(struct PrivilegeSet *parent, const char
struct PrivilegeSet *privilegeset_get(const char *name);
struct PrivilegeSet *privilegeset_ref(struct PrivilegeSet *set);
void privilegeset_unref(struct PrivilegeSet *set);
void privilegeset_mark_all_illegal(void);
void privilegeset_delete_all_illegal(void);
#endif

156
src/privilege.c
View file

@ -22,6 +22,7 @@
*/
#include <stdinc.h>
#include "s_conf.h"
#include "privilege.h"
static rb_dlink_list privilegeset_list = {};
@ -35,50 +36,8 @@ privilegeset_in_set(struct PrivilegeSet *set, const char *priv)
return strstr(set->privs, priv) != NULL;
}
struct PrivilegeSet *
privilegeset_set_new(const char *name, const char *privs, PrivilegeFlags flags)
{
struct PrivilegeSet *set;
s_assert(privilegeset_get(name) == NULL);
set = rb_malloc(sizeof(struct PrivilegeSet));
set->refs = 1;
set->name = rb_strdup(name);
set->privs = rb_strdup(privs);
set->flags = flags;
rb_dlinkAdd(set, &set->node, &privilegeset_list);
return set;
}
struct PrivilegeSet *
privilegeset_extend(struct PrivilegeSet *parent, const char *name, const char *privs, PrivilegeFlags flags)
{
struct PrivilegeSet *set;
s_assert(parent != NULL);
s_assert(name != NULL);
s_assert(privs != NULL);
s_assert(privilegeset_get(name) == NULL);
set = rb_malloc(sizeof(struct PrivilegeSet));
set->refs = 1;
set->name = rb_strdup(name);
set->flags = flags;
set->privs = rb_malloc(strlen(parent->privs) + 1 + strlen(privs) + 1);
strcpy(set->privs, parent->privs);
strcat(set->privs, " ");
strcat(set->privs, privs);
rb_dlinkAdd(set, &set->node, &privilegeset_list);
return set;
}
struct PrivilegeSet *
privilegeset_get(const char *name)
static struct PrivilegeSet *
privilegeset_get_any(const char *name)
{
rb_dlink_node *iter;
@ -95,6 +54,80 @@ privilegeset_get(const char *name)
return NULL;
}
struct PrivilegeSet *
privilegeset_set_new(const char *name, const char *privs, PrivilegeFlags flags)
{
struct PrivilegeSet *set;
set = privilegeset_get_any(name);
if (set != NULL)
{
if (!(set->status & CONF_ILLEGAL))
ilog(L_MAIN, "Duplicate privset %s", name);
set->status &= ~CONF_ILLEGAL;
rb_free(set->privs);
}
else
{
set = rb_malloc(sizeof(struct PrivilegeSet));
set->status = 0;
set->refs = 0;
set->name = rb_strdup(name);
rb_dlinkAdd(set, &set->node, &privilegeset_list);
}
set->privs = rb_strdup(privs);
set->flags = flags;
return set;
}
struct PrivilegeSet *
privilegeset_extend(struct PrivilegeSet *parent, const char *name, const char *privs, PrivilegeFlags flags)
{
struct PrivilegeSet *set;
s_assert(parent != NULL);
s_assert(name != NULL);
s_assert(privs != NULL);
set = privilegeset_get_any(name);
if (set != NULL)
{
if (!(set->status & CONF_ILLEGAL))
ilog(L_MAIN, "Duplicate privset %s", name);
set->status &= ~CONF_ILLEGAL;
rb_free(set->privs);
}
else
{
set = rb_malloc(sizeof(struct PrivilegeSet));
set->status = 0;
set->refs = 0;
set->name = rb_strdup(name);
rb_dlinkAdd(set, &set->node, &privilegeset_list);
}
set->flags = flags;
set->privs = rb_malloc(strlen(parent->privs) + 1 + strlen(privs) + 1);
strcpy(set->privs, parent->privs);
strcat(set->privs, " ");
strcat(set->privs, privs);
return set;
}
struct PrivilegeSet *
privilegeset_get(const char *name)
{
struct PrivilegeSet *set;
set = privilegeset_get_any(name);
if (set != NULL && set->status & CONF_ILLEGAL)
set = NULL;
return set;
}
struct PrivilegeSet *
privilegeset_ref(struct PrivilegeSet *set)
{
@ -110,7 +143,12 @@ privilegeset_unref(struct PrivilegeSet *set)
{
s_assert(set != NULL);
if (--set->refs == 0)
if (set->refs > 0)
set->refs--;
else
ilog(L_MAIN, "refs on privset %s is already 0",
set->name);
if (set->refs == 0 && set->status & CONF_ILLEGAL)
{
rb_dlinkDelete(&set->node, &privilegeset_list);
@ -119,3 +157,31 @@ privilegeset_unref(struct PrivilegeSet *set)
rb_free(set);
}
}
void
privilegeset_mark_all_illegal(void)
{
rb_dlink_node *iter;
RB_DLINK_FOREACH(iter, privilegeset_list.head)
{
struct PrivilegeSet *set = (struct PrivilegeSet *) iter->data;
set->status |= CONF_ILLEGAL;
/* but do not free it yet */
}
}
void
privilegeset_delete_all_illegal(void)
{
rb_dlink_node *iter, *next;
RB_DLINK_FOREACH_SAFE(iter, next, privilegeset_list.head)
{
struct PrivilegeSet *set = (struct PrivilegeSet *) iter->data;
privilegeset_ref(set);
privilegeset_unref(set);
}
}

4
src/s_conf.c
View file

@ -46,6 +46,7 @@
#include "reject.h"
#include "cache.h"
#include "blacklist.h"
#include "privilege.h"
#include "sslproc.h"
struct config_server_hide ConfigServerHide;
@ -853,6 +854,7 @@ read_conf(FILE * file)
validate_conf(); /* Check to make sure some values are still okay. */
/* Some global values are also loaded here. */
check_class(); /* Make sure classes are valid */
privilegeset_delete_all_illegal();
}
static void
@ -1253,6 +1255,8 @@ clear_out_old_conf(void)
destroy_blacklists();
privilegeset_mark_all_illegal();
/* OK, that should be everything... */
}