X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fimap%2Fimap_acl.c;h=05426de46c008417244222b63d2daf2bad300943;hb=7a9b0685e406cc83597171cc39d008c7e5459ca8;hp=0ca96dfc85b7de6d1c0007eded07ffefa0a9dc51;hpb=d9a896503ba54a3b0b3c95059bac85541ba55090;p=citadel.git

diff --git a/citadel/modules/imap/imap_acl.c b/citadel/modules/imap/imap_acl.c
index 0ca96dfc8..05426de46 100644
--- a/citadel/modules/imap/imap_acl.c
+++ b/citadel/modules/imap/imap_acl.c
@@ -1,8 +1,7 @@
 /*
  * Functions which implement RFC2086 (and maybe RFC4314) (IMAP ACL extension)
  *
- *
- * Copyright (c) 2007-2011 by the citadel.org team
+ * Copyright (c) 2007-2017 by the citadel.org team
  *
  *  This program is open source software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -28,18 +27,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <ctype.h>
 #include <string.h>
@@ -171,7 +159,7 @@ void imap_getacl(int num_parms, ConstStr *Params) {
 	if (IMAP->selected) {
 		strcpy(savedroom, CC->room.QRname);
 	}
-	CtdlUserGoto(roomname, 0, 0, &msgs, &new);
+	CtdlUserGoto(roomname, 0, 0, &msgs, &new, NULL, NULL);
 
 	IAPuts("* ACL ");
 	IPutCParamStr(2);
@@ -192,7 +180,7 @@ void imap_getacl(int num_parms, ConstStr *Params) {
 			imap_acl_flags(rights, ra);
 			if (StrLength(rights) > 0) {
 				IAPuts(" ");
-				plain_imap_strout(temp.fullname);
+				IPutStr(temp.fullname, strlen(temp.fullname));
 				IAPuts(" ");
 				iaputs(SKEY( rights));
 			}
@@ -206,7 +194,7 @@ void imap_getacl(int num_parms, ConstStr *Params) {
 	 * our happy day without violent explosions.
 	 */
 	if (IMAP->selected) {
-		CtdlUserGoto(savedroom, 0, 0, &msgs, &new);
+		CtdlUserGoto(savedroom, 0, 0, &msgs, &new, NULL, NULL);
 	}
 
 	IReply("OK GETACL completed");
@@ -221,7 +209,7 @@ void imap_listrights(int num_parms, ConstStr *Params) {
 	char savedroom[ROOMNAMELEN];
 	int msgs, new;
 	int ret;
-	struct recptypes *valid;
+	recptypes *valid;
 	struct ctdluser temp;
 
 	if (num_parms != 4) {
@@ -261,7 +249,7 @@ void imap_listrights(int num_parms, ConstStr *Params) {
 	if (IMAP->selected) {
 		strcpy(savedroom, CC->room.QRname);
 	}
-	CtdlUserGoto(roomname, 0, 0, &msgs, &new);
+	CtdlUserGoto(roomname, 0, 0, &msgs, &new, NULL, NULL);
 
 	/*
 	 * Now output the list of rights
@@ -279,7 +267,7 @@ void imap_listrights(int num_parms, ConstStr *Params) {
 	 * our happy day without violent explosions.
 	 */
 	if (IMAP->selected) {
-		CtdlUserGoto(savedroom, 0, 0, &msgs, &new);
+		CtdlUserGoto(savedroom, 0, 0, &msgs, &new, NULL, NULL);
 	}
 
 	IReply("OK LISTRIGHTS completed");
@@ -316,7 +304,7 @@ void imap_myrights(int num_parms, ConstStr *Params) {
 	if (IMAP->selected) {
 		strcpy(savedroom, CC->room.QRname);
 	}
-	CtdlUserGoto(roomname, 0, 0, &msgs, &new);
+	CtdlUserGoto(roomname, 0, 0, &msgs, &new, NULL, NULL);
 
 	CtdlRoomAccess(&CC->room, &CC->user, &ra, NULL);
 	rights = NewStrBuf();
@@ -334,7 +322,7 @@ void imap_myrights(int num_parms, ConstStr *Params) {
 	 * If a different folder was previously selected, return there now.
 	 */
 	if ( (IMAP->selected) && (strcasecmp(roomname, savedroom)) ) {
-		CtdlUserGoto(savedroom, 0, 0, &msgs, &new);
+		CtdlUserGoto(savedroom, 0, 0, &msgs, &new, NULL, NULL);
 	}
 
 	IReply("OK MYRIGHTS completed");