groupserv: store myentity_t in access entries.

diff --git a/modules/groupserv/flags.c b/modules/groupserv/flags.c
index 01822cbd10373512eb13917cd0ae77f8899cfc9d..ca1f14b515f77eb60e783af5d62f9b7ba5371914 100644 (file)
--- a/modules/groupserv/flags.c
+++ b/modules/groupserv/flags.c
@@ -66,7 +66,7 @@ static void gs_cmd_flags(sourceinfo_t *si, int parc, char *parv[])
                {
                        ga = n->data;
 
-                       command_success_nodata(si, "%-5d %-22s %s", i, entity(ga->mu)->name,
+                       command_success_nodata(si, "%-5d %-22s %s", i, ga->mt->name,
                                               gflags_tostr(ga_flags, ga->flags));
 
                        i++;

diff --git a/modules/groupserv/main/database.c b/modules/groupserv/main/database.c
index 18599c748ada78e8a4aa7d654b4d64612d2da57e..9f8512204c04a379cbfb24a2d463350145331825 100644 (file)
--- a/modules/groupserv/main/database.c
+++ b/modules/groupserv/main/database.c
@@ -43,7 +43,7 @@ static void write_groupdb(database_handle_t *db)
 
                        db_start_row(db, "GACL");
                        db_start_row(db, entity(mg)->name);
-                       db_start_row(db, entity(ga->mu)->name);
+                       db_start_row(db, mt->name);
                        db_start_row(db, flags);
                        db_commit_row(db);
                }

diff --git a/modules/groupserv/main/groupserv.c b/modules/groupserv/main/groupserv.c
index aba166e2beac02678c9ff2e54209e4bb08d82018..92ef271ee6209c3fb23b926ce1bc194285237a73 100644 (file)
--- a/modules/groupserv/main/groupserv.c
+++ b/modules/groupserv/main/groupserv.c
@@ -52,7 +52,7 @@ static void mygroup_delete(mygroup_t *mg)
                groupacs_t *ga = n->data;
 
                mowgli_node_delete(&ga->gnode, &mg->acs);
-               mowgli_node_delete(&ga->unode, myentity_get_membership_list(entity(ga->mu)));
+               mowgli_node_delete(&ga->unode, myentity_get_membership_list(ga->mt));
                object_unref(ga);
        }
 
@@ -125,7 +125,7 @@ groupacs_t *groupacs_add(mygroup_t *mg, myuser_t *mu, unsigned int flags)
        object_init(object(ga), NULL, (destructor_t) groupacs_des);
 
        ga->mg = mg;
-       ga->mu = mu;
+       ga->mt = entity(mu);
        ga->flags = flags;
 
        mowgli_node_add(ga, &ga->gnode, &mg->acs);
@@ -147,10 +147,10 @@ groupacs_t *groupacs_find(mygroup_t *mg, myuser_t *mu, unsigned int flags)
 
                if (flags)
                {
-                       if (ga->mu == mu && ga->mg == mg && (ga->flags & flags))
+                       if (ga->mt == entity(mu) && ga->mg == mg && (ga->flags & flags))
                                return ga;
                }
-               else if (ga->mu == mu && ga->mg == mg)
+               else if (ga->mt == entity(mu) && ga->mg == mg)
                        return ga;
        }
 
@@ -234,11 +234,11 @@ const char *mygroup_founder_names(mygroup_t *mg)
         MOWGLI_ITER_FOREACH(n, mg->acs.head)
         {
                 ga = n->data;
-                if (ga->mu != NULL && ga->flags & GA_FOUNDER)
+                if (ga->mt != NULL && ga->flags & GA_FOUNDER)
                 {
                         if (names[0] != '\0')
                                 mowgli_strlcat(names, ", ", sizeof names);
-                        mowgli_strlcat(names, entity(ga->mu)->name, sizeof names);
+                        mowgli_strlcat(names, ga->mt->name, sizeof names);
                 }
         }
         return names;
@@ -255,7 +255,7 @@ unsigned int myentity_count_group_flag(myentity_t *mt, unsigned int flagset)
        {
                groupacs_t *ga = n->data;
 
-               if (ga->mu == user(mt) && ga->flags & flagset)
+               if (ga->mt == mt && ga->flags & flagset)
                        count++;
        }
 

diff --git a/modules/groupserv/main/groupserv_common.h b/modules/groupserv/main/groupserv_common.h
index f31b0f8cedc92f24bed68f51b0555feb8dd2ba26..f6c4f37c1d9498effb52aca58af7ee0dcb4e4d0a 100644 (file)
--- a/modules/groupserv/main/groupserv_common.h
+++ b/modules/groupserv/main/groupserv_common.h
@@ -51,7 +51,7 @@ struct groupacs_ {
        object_t parent;
 
        mygroup_t *mg;
-       myuser_t *mu;
+       myentity_t *mt;
        unsigned int flags;
 
        mowgli_node_t gnode;

diff --git a/modules/groupserv/main/hooks.c b/modules/groupserv/main/hooks.c
index 48259d388c094c96adfe12227417aec365eca074..c192ae836f53e01858f5f92c28dd58898950253a 100644 (file)
--- a/modules/groupserv/main/hooks.c
+++ b/modules/groupserv/main/hooks.c
@@ -175,7 +175,7 @@ static void myuser_delete_hook(myuser_t *mu)
        {
                groupacs_t *ga = n->data;
 
-               groupacs_delete(ga->mg, ga->mu);
+               groupacs_delete(ga->mg, user(ga->mt));
        }
 
        mowgli_list_free(l);