#include <ctype.h>
#include <string.h>
#include <limits.h>
-
-#ifdef HAVE_OPENSSL
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-#endif
-
#include "citadel.h"
#include "server.h"
#include "sysdep_decls.h"
void imap_free_msgids(void)
{
if (IMAP->msgids != NULL) {
- phree(IMAP->msgids);
+ free(IMAP->msgids);
IMAP->msgids = NULL;
IMAP->num_msgs = 0;
}
if (IMAP->flags != NULL) {
- phree(IMAP->flags);
+ free(IMAP->flags);
IMAP->flags = NULL;
}
}
void imap_free_transmitted_message(void)
{
if (IMAP->transmitted_message != NULL) {
- phree(IMAP->transmitted_message);
+ free(IMAP->transmitted_message);
IMAP->transmitted_message = NULL;
IMAP->transmitted_length = 0;
}
IMAP->num_msgs = IMAP->num_msgs + 1;
if (IMAP->msgids == NULL) {
- IMAP->msgids = mallok(IMAP->num_msgs * sizeof(long)
+ IMAP->msgids = malloc(IMAP->num_msgs * sizeof(long)
* REALLOC_INCREMENT);
} else if (IMAP->num_msgs % REALLOC_INCREMENT == 0) {
- IMAP->msgids = reallok(IMAP->msgids,
+ IMAP->msgids = realloc(IMAP->msgids,
(IMAP->num_msgs +
REALLOC_INCREMENT) * sizeof(long));
}
if (IMAP->flags == NULL) {
- IMAP->flags = mallok(IMAP->num_msgs * sizeof(long)
+ IMAP->flags = malloc(IMAP->num_msgs * sizeof(long)
* REALLOC_INCREMENT);
} else if (IMAP->num_msgs % REALLOC_INCREMENT == 0) {
- IMAP->flags = reallok(IMAP->flags,
+ IMAP->flags = realloc(IMAP->flags,
(IMAP->num_msgs +
REALLOC_INCREMENT) * sizeof(long));
}
{
if (IMAP->selected == 0) {
- lprintf(5,
+ lprintf(CTDL_ERR,
"imap_load_msgids() can't run; no room selected\n");
return;
}
imap_add_single_msgid, NULL);
imap_set_seen_flags();
- lprintf(9, "imap_load_msgids() mapped %d messages\n",
+ lprintf(CTDL_DEBUG, "imap_load_msgids() mapped %d messages\n",
IMAP->num_msgs);
}
if (IMAP->selected == 0) {
- lprintf(5,
+ lprintf(CTDL_ERR,
"imap_load_msgids() can't run; no room selected\n");
return;
}
*/
cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
if (cdbfr != NULL) {
- msglist = mallok(cdbfr->len);
+ msglist = malloc(cdbfr->len);
memcpy(msglist, cdbfr->ptr, cdbfr->len);
num_msgs = cdbfr->len / sizeof(long);
cdb_free(cdbfr);
}
if (num_msgs != 0)
- phree(msglist);
+ free(msglist);
}
if (CC->h_command_function != imap_command_loop)
return;
- lprintf(9, "Performing IMAP cleanup hook\n");
+ lprintf(CTDL_DEBUG, "Performing IMAP cleanup hook\n");
imap_free_msgids();
imap_free_transmitted_message();
- lprintf(9, "Finished IMAP cleanup hook\n");
+
+ if (IMAP->cached_fetch != NULL) {
+ fclose(IMAP->cached_fetch);
+ IMAP->cached_fetch = NULL;
+ IMAP->cached_msgnum = (-1);
+ }
+
+ if (IMAP->cached_body != NULL) {
+ fclose(IMAP->cached_body);
+ IMAP->cached_body = NULL;
+ IMAP->cached_bodymsgnum = (-1);
+ }
+
+ lprintf(CTDL_DEBUG, "Finished IMAP cleanup hook\n");
}
strcpy(CC->cs_clientname, "IMAP session");
CtdlAllocUserData(SYM_IMAP, sizeof(struct citimap));
IMAP->authstate = imap_as_normal;
+ IMAP->cached_fetch = NULL;
+ IMAP->cached_msgnum = (-1);
cprintf("* OK %s Citadel/UX IMAP4rev1 server ready\r\n",
config.c_fqdn);
*/
void imap_capability(int num_parms, char *parms[])
{
- cprintf("* CAPABILITY IMAP4 IMAP4REV1 AUTH=LOGIN");
+ cprintf("* CAPABILITY IMAP4 IMAP4REV1 NAMESPACE AUTH=LOGIN");
#ifdef HAVE_OPENSSL
cprintf(" STARTTLS");
int i;
int num_expunged = 0;
- lprintf(9, "imap_do_expunge() called\n");
+ lprintf(CTDL_DEBUG, "imap_do_expunge() called\n");
if (IMAP->selected == 0)
return (0);
CtdlDeleteMessages(CC->room.QRname,
IMAP->msgids[i], "");
++num_expunged;
- lprintf(9, "%ld ... deleted\n",
+ lprintf(CTDL_DEBUG, "%ld ... deleted\n",
IMAP->msgids[i]);
} else {
- lprintf(9, "%ld ... not deleted\n",
+ lprintf(CTDL_DEBUG, "%ld ... not deleted\n",
IMAP->msgids[i]);
}
}
}
+/*
+ * Implements the NAMESPACE command.
+ */
+void imap_namespace(int num_parms, char *parms[])
+{
+ int i;
+ struct floor *fl;
+ int floors = 0;
+ char buf[SIZ];
+
+ cprintf("* NAMESPACE ");
+
+ /* All personal folders are subordinate to INBOX. */
+ cprintf("((\"INBOX|\" \"|\")) ");
+
+ /* Other users' folders ... coming soon! FIXME */
+ cprintf("NIL ");
+
+ /* Show all floors as shared namespaces. Neato! */
+ cprintf("(");
+ for (i = 0; i < MAXFLOORS; ++i) {
+ fl = cgetfloor(i);
+ if (fl->f_flags & F_INUSE) {
+ if (floors > 0) cprintf(" ");
+ cprintf("(");
+ sprintf(buf, "%s|", fl->f_name);
+ imap_strout(buf);
+ cprintf(" \"|\")");
+ ++floors;
+ }
+ }
+ cprintf(")");
+
+ /* Wind it up with a newline and a completion message. */
+ cprintf("\r\n");
+ cprintf("%s OK NAMESPACE completed\r\n", parms[0]);
+}
+
/*
if (strchr(parms[2], '\\') != NULL) {
cprintf("%s NO Invalid character in folder name\r\n",
parms[0]);
+ lprintf(CTDL_DEBUG, "invalid character in folder name\n");
return;
}
if (ret < 0) {
cprintf("%s NO Invalid mailbox name or location\r\n",
parms[0]);
+ lprintf(CTDL_DEBUG, "invalid mailbox name or location\n");
return;
}
floornum = (ret & 0x00ff); /* lower 8 bits = floor number */
flags = (ret & 0xff00); /* upper 8 bits = flags */
+ if (flags & IR_MAILBOX) {
+ if (strncasecmp(parms[2], "INBOX|", 6)) {
+ cprintf("%s NO Personal folders must be created under INBOX\r\n", parms[0]);
+ lprintf(CTDL_DEBUG, "not subordinate to inbox\n");
+ return;
+ }
+ }
+
if (flags & IR_MAILBOX) {
newroomtype = 4; /* private mailbox */
} else {
newroomtype = 0; /* public folder */
}
- lprintf(7, "Create new room <%s> on floor <%d> with type <%d>\n",
+ lprintf(CTDL_INFO, "Create new room <%s> on floor <%d> with type <%d>\n",
roomname, floornum, newroomtype);
ret = create_room(roomname, newroomtype, "", floornum, 1, 0);
} else {
cprintf("%s OK CREATE completed\r\n", parms[0]);
}
+ lprintf(CTDL_DEBUG, "imap_create() completed\n");
}
sizeof newroomname,
newfoldername) & 0xFF;
- irlp = (struct irl *) mallok(sizeof(struct irl));
+ irlp = (struct irl *) malloc(sizeof(struct irl));
strcpy(irlp->irl_newroom, newroomname);
strcpy(irlp->irl_oldroom, qrbuf->QRname);
irlp->irl_newfloor = newfloor;
irl->irl_newfloor);
if (r != crr_ok) {
/* FIXME handle error returns better */
- lprintf(5, "CtdlRenameRoom() error %d\n",
+ lprintf(CTDL_ERR, "CtdlRenameRoom() error %d\n",
r);
}
irlp = irl;
irl = irl->next;
- phree(irlp);
+ free(irlp);
}
}
time(&CC->lastcmd);
memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
if (client_gets(cmdbuf) < 1) {
- lprintf(3, "IMAP socket is broken. Ending session.\r\n");
+ lprintf(CTDL_ERR, "IMAP socket is broken. Ending session.\r\n");
CC->kill_me = 1;
return;
}
- lprintf(5, "IMAP: %s\r\n", cmdbuf);
+ lprintf(CTDL_INFO, "IMAP: %s\r\n", cmdbuf);
while (strlen(cmdbuf) < 5)
strcat(cmdbuf, " ");
imap_starttls(num_parms, parms);
}
#endif
-
else if (!CC->logged_in) {
cprintf("%s BAD Not logged in.\r\n", parms[0]);
}
imap_append(num_parms, parms);
}
+ else if (!strcasecmp(parms[1], "NAMESPACE")) {
+ imap_namespace(num_parms, parms);
+ }
+
else if (IMAP->selected == 0) {
cprintf("%s BAD no folder selected\r\n", parms[0]);
}