cdb_next_item() now returns both key and value

[citadel.git] / citadel / server / modules / imap / imap_acl.c

diff --git a/citadel/server/modules/imap/imap_acl.c b/citadel/server/modules/imap/imap_acl.c
index da1ff39bdee553a583ec056a8a1a2bffbcd40d29..fbc5460af268b22c107e09ec9eb34809f7619aac 100644 (file)
--- a/citadel/server/modules/imap/imap_acl.c
+++ b/citadel/server/modules/imap/imap_acl.c
@@ -107,7 +107,7 @@ void imap_getacl(int num_parms, ConstStr *Params) {
        int msgs, new;
        int ret;
        struct ctdluser temp;
-       struct cdbdata cdbus;
+       struct cdbkeyval cdbus;
        int ra;
        StrBuf *rights;
 
@@ -136,9 +136,9 @@ void imap_getacl(int num_parms, ConstStr *Params) {
        // Traverse the userlist
        rights = NewStrBuf();
        cdb_rewind(CDB_USERS);
-       while (cdbus = cdb_next_item(CDB_USERS), cdbus.ptr!=NULL) {
+       while (cdbus = cdb_next_item(CDB_USERS), cdbus.val.ptr!=NULL) {
                memset(&temp, 0, sizeof temp);
-               memcpy(&temp, cdbus.ptr, sizeof temp);
+               memcpy(&temp, cdbus.val.ptr, sizeof temp);
 
                CtdlRoomAccess(&CC->room, &temp, &ra, NULL);
                if (!IsEmptyStr(temp.fullname)) {