struct cdbdata *cdbfr;
if (IMAP->selected == 0) {
- lprintf(CTDL_ERR,
+ CtdlLogPrintf(CTDL_ERR,
"imap_load_msgids() can't run; no room selected\n");
return;
}
int num_recent = 0;
if (IMAP->selected == 0) {
- lprintf(CTDL_ERR,
+ CtdlLogPrintf(CTDL_ERR,
"imap_load_msgids() can't run; no room selected\n");
return;
}
if (cdbfr != NULL) {
msglist = malloc(cdbfr->len);
if (msglist == NULL) {
- lprintf(CTDL_CRIT, "malloc() failed\n");
+ CtdlLogPrintf(CTDL_CRIT, "malloc() failed\n");
abort();
}
memcpy(msglist, cdbfr->ptr, (size_t)cdbfr->len);
imap_do_expunge();
}
- lprintf(CTDL_DEBUG, "Performing IMAP cleanup hook\n");
+ CtdlLogPrintf(CTDL_DEBUG, "Performing IMAP cleanup hook\n");
imap_free_msgids();
imap_free_transmitted_message();
}
free(IMAP);
- lprintf(CTDL_DEBUG, "Finished IMAP cleanup hook\n");
+ CtdlLogPrintf(CTDL_DEBUG, "Finished IMAP cleanup hook\n");
}
IMAP->cached_rfc822_msgnum = (-1);
IMAP->cached_rfc822_withbody = 0;
+ if (CC->nologin)
+ {
+ cprintf("* BYE; Server busy, try later\r\n");
+ CC->kill_me = 1;
+ return;
+ }
cprintf("* OK [");
imap_output_capability_string();
cprintf("] %s IMAP4rev1 %s ready\r\n", config.c_fqdn, CITADEL);
cprintf("* OK [UIDVALIDITY %ld] UID validity status\r\n", GLOBAL_UIDVALIDITY_VALUE);
cprintf("* OK [UIDNEXT %ld] Predicted next UID\r\n", CitControl.MMhighest + 1);
- /* Note that \Deleted is a valid flag, but not a permanent flag,
+ /* Technically, \Deleted is a valid flag, but not a permanent flag,
* because we don't maintain its state across sessions. Citadel
* automatically expunges mailboxes when they are de-selected.
+ *
+ * Unfortunately, omitting \Deleted as a PERMANENTFLAGS flag causes
+ * some clients (particularly Thunderbird) to misbehave -- they simply
+ * electing not to transmit the flag at all. So we have to advertise
+ * \Deleted as a PERMANENTFLAGS flag, even though it technically isn't.
*/
cprintf("* FLAGS (\\Deleted \\Seen \\Answered)\r\n");
- cprintf("* OK [PERMANENTFLAGS (\\Deleted \\Seen \\Answered)] "
- "permanent flags\r\n");
+ cprintf("* OK [PERMANENTFLAGS (\\Deleted \\Seen \\Answered)] permanent flags\r\n");
cprintf("%s OK [%s] %s completed\r\n",
parms[0],
long *delmsgs = NULL;
int num_delmsgs = 0;
- lprintf(CTDL_DEBUG, "imap_do_expunge() called\n");
+ CtdlLogPrintf(CTDL_DEBUG, "imap_do_expunge() called\n");
if (IMAP->selected == 0) {
return (0);
}
imap_rescan_msgids();
}
- lprintf(CTDL_DEBUG, "Expunged %d messages from <%s>\n",
+ CtdlLogPrintf(CTDL_DEBUG, "Expunged %d messages from <%s>\n",
num_expunged, CC->room.QRname);
return (num_expunged);
}
int flags;
int newroomtype = 0;
int newroomview = 0;
+ char *notification_message = NULL;
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");
+ CtdlLogPrintf(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");
+ CtdlLogPrintf(CTDL_DEBUG, "invalid mailbox name or location\n");
return;
}
floornum = (ret & 0x00ff); /* lower 8 bits = floor number */
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");
+ CtdlLogPrintf(CTDL_DEBUG, "not subordinate to inbox\n");
return;
}
}
newroomview = VIEW_BBS;
}
- lprintf(CTDL_INFO, "Create new room <%s> on floor <%d> with type <%d>\n",
+ CtdlLogPrintf(CTDL_INFO, "Create new room <%s> on floor <%d> with type <%d>\n",
roomname, floornum, newroomtype);
ret = create_room(roomname, newroomtype, "", floornum, 1, 0, newroomview);
cprintf("%s NO Mailbox already exists, or create failed\r\n", parms[0]);
} else {
cprintf("%s OK CREATE completed\r\n", parms[0]);
+ /* post a message in Aide> describing the new room */
+ notification_message = malloc(1024);
+ snprintf(notification_message, 1024,
+ "A new room called \"%s\" has been created by %s%s%s%s\n",
+ roomname,
+ CC->user.fullname,
+ ((ret & QR_MAILBOX) ? " [personal]" : ""),
+ ((ret & QR_PRIVATE) ? " [private]" : ""),
+ ((ret & QR_GUESSNAME) ? " [hidden]" : "")
+ );
+ aide_message(notification_message, "Room Creation Message");
+ free(notification_message);
}
- lprintf(CTDL_DEBUG, "imap_create() completed\n");
+ CtdlLogPrintf(CTDL_DEBUG, "imap_create() completed\n");
}
struct irl *irl = NULL; /* the list */
struct irl *irlp = NULL; /* scratch pointer */
struct irlparms irlparms;
+ char buf[1024];
if (strchr(parms[3], '\\') != NULL) {
cprintf("%s NO Invalid character in folder name\r\n",
return;
}
-
/* If this is the INBOX, then RFC2060 says we have to just move the
* contents. In a Citadel environment it's easier to rename the room
* (already did that) and create a new inbox.
irl->irl_newfloor);
if (r != crr_ok) {
/* FIXME handle error returns better */
- lprintf(CTDL_ERR, "CtdlRenameRoom() error %d\n", r);
+ CtdlLogPrintf(CTDL_ERR, "CtdlRenameRoom() error %d\n", r);
}
irlp = irl;
irl = irl->next;
}
}
+ snprintf(buf, sizeof buf, "IMAP folder \"%s\" renamed to \"%s\" by %s\n",
+ parms[2],
+ parms[3],
+ CC->curr_user
+ );
+ aide_message(buf, "IMAP folder rename");
+
cprintf("%s OK RENAME completed\r\n", parms[0]);
}
int num_parms;
struct timeval tv1, tv2;
suseconds_t total_time = 0;
+ int untagged_ok = 1;
gettimeofday(&tv1, NULL);
CC->lastcmd = time(NULL);
memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
flush_output();
if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
- lprintf(CTDL_ERR, "Client disconnected: ending session.\r\n");
+ CtdlLogPrintf(CTDL_ERR, "Client disconnected: ending session.\r\n");
CC->kill_me = 1;
return;
}
if (IMAP->authstate == imap_as_expecting_password) {
- lprintf(CTDL_INFO, "IMAP: <password>\n");
+ CtdlLogPrintf(CTDL_INFO, "IMAP: <password>\n");
}
else if (IMAP->authstate == imap_as_expecting_plainauth) {
- lprintf(CTDL_INFO, "IMAP: <plain_auth>\n");
+ CtdlLogPrintf(CTDL_INFO, "IMAP: <plain_auth>\n");
}
else if (bmstrcasestr(cmdbuf, " LOGIN ")) {
- lprintf(CTDL_INFO, "IMAP: LOGIN...\n");
+ CtdlLogPrintf(CTDL_INFO, "IMAP: LOGIN...\n");
}
else {
- lprintf(CTDL_INFO, "IMAP: %s\n", cmdbuf);
+ CtdlLogPrintf(CTDL_INFO, "IMAP: %s\n", cmdbuf);
}
while (strlen(cmdbuf) < 5)
* If the command just submitted does not contain a literal, we
* might think about delivering some untagged stuff...
*/
- if (cmdbuf[strlen(cmdbuf)-1] != '}') {
+ if (cmdbuf[strlen(cmdbuf)-1] == '}') {
+ untagged_ok = 0;
+ }
+
+ /* Grab the tag, command, and parameters. */
+ num_parms = imap_parameterize(parms, cmdbuf);
- imap_print_instant_messages();
+ /* RFC3501 says that we cannot output untagged data during these commands */
+ if (num_parms >= 2) {
+ if ( (!strcasecmp(parms[1], "FETCH"))
+ || (!strcasecmp(parms[1], "STORE"))
+ || (!strcasecmp(parms[1], "SEARCH"))
+ ) {
+ untagged_ok = 0;
+ }
+ }
+ if (untagged_ok) {
+
+ /* we can put any additional untagged stuff right here in the future */
+
/*
* Before processing the command that was just entered... if we happen
* to have a folder selected, we'd like to rescan that folder for new
* messages, and for deletions/changes of existing messages. This
- * could probably be optimized somehow, but IMAP sucks...
+ * could probably be optimized better with some deep thought...
*/
if (IMAP->selected) {
imap_rescan_msgids();
/* Now for the command set. */
- /* Grab the tag, command, and parameters. Check syntax. */
- num_parms = imap_parameterize(parms, cmdbuf);
if (num_parms < 2) {
cprintf("BAD syntax error\r\n");
}
else if (!strcasecmp(parms[1], "LOGOUT")) {
if (IMAP->selected) {
- imap_do_expunge(); /* yes, we auto-expunge */
+ imap_do_expunge(); /* yes, we auto-expunge at logout */
}
cprintf("* BYE %s logging out\r\n", config.c_fqdn);
cprintf("%s OK Citadel IMAP session ended.\r\n",
gettimeofday(&tv2, NULL);
total_time = (tv2.tv_usec + (tv2.tv_sec * 1000000)) - (tv1.tv_usec + (tv1.tv_sec * 1000000));
- lprintf(CTDL_DEBUG, "IMAP command completed in %ld.%ld seconds\n",
+ CtdlLogPrintf(CTDL_INFO, "IMAP: %s\n", cmdbuf); // FIXME FIXME FIXME REMOVE THIS NOW
+ CtdlLogPrintf(CTDL_DEBUG, "IMAP command completed in %ld.%ld seconds\n",
(total_time / 1000000),
(total_time % 1000000)
);