cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add privilegeset_extend().

This commit is contained in:
William Pitcock 2008-08-17 06:35:49 -05:00
parent 9291987bba
commit 0e52880760
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/privilege.h
View File

@ -40,6 +40,7 @@ struct PrivilegeSet {
int privilegeset_in_set(struct PrivilegeSet *set, const char *priv); int privilegeset_in_set(struct PrivilegeSet *set, const char *priv);
struct PrivilegeSet *privilegeset_set_new(const char *name, const char *privs, PrivilegeFlags flags); struct PrivilegeSet *privilegeset_set_new(const char *name, const char *privs, PrivilegeFlags flags);
struct PrivilegeSet *privilegeset_extend(struct PrivilegeSet *parent, const char *name, const char *privs, PrivilegeFlags flags);
struct PrivilegeSet *privilegeset_get(const char *name); struct PrivilegeSet *privilegeset_get(const char *name);
void privilegeset_ref(struct PrivilegeSet *set); void privilegeset_ref(struct PrivilegeSet *set);
void privilegeset_unref(struct PrivilegeSet *set); void privilegeset_unref(struct PrivilegeSet *set);

24
src/privilege.c
View File

@ -40,6 +40,8 @@ privilegeset_set_new(const char *name, const char *privs, PrivilegeFlags flags)
{ {
struct PrivilegeSet *set; struct PrivilegeSet *set;
s_assert(privilegeset_get(name) == NULL);
set = rb_malloc(sizeof(struct PrivilegeSet)); set = rb_malloc(sizeof(struct PrivilegeSet));
set->refs = 1; set->refs = 1;
set->name = rb_strdup(name); set->name = rb_strdup(name);
@ -51,6 +53,28 @@ privilegeset_set_new(const char *name, const char *privs, PrivilegeFlags flags)
return set; 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(parent->privs, set->privs);
strcat(set->privs, " ");
strcat(set->privs, privs);
return set;
}
struct PrivilegeSet * struct PrivilegeSet *
privilegeset_get(const char *name) privilegeset_get(const char *name)
{ {