projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
[citadel.git]
/
citadel
/
modules
/
imap
/
serv_imap.c
diff --git
a/citadel/modules/imap/serv_imap.c
b/citadel/modules/imap/serv_imap.c
index 278cc73323392b3883c08ff8ee58b75d1b8fa163..60584df2750235c6f611586b144e94a09751e4ba 100644
(file)
--- a/
citadel/modules/imap/serv_imap.c
+++ b/
citadel/modules/imap/serv_imap.c
@@
-1,7
+1,7
@@
/*
* IMAP server for the Citadel system
*
/*
* IMAP server for the Citadel system
*
- * Copyright (C) 2000-201
1
by Art Cancro and others.
+ * Copyright (C) 2000-201
5
by Art Cancro and others.
* This code is released under the terms of the GNU General Public License.
*
* WARNING: the IMAP protocol is badly designed. No implementation of it
* This code is released under the terms of the GNU General Public License.
*
* WARNING: the IMAP protocol is badly designed. No implementation of it
@@
-17,10
+17,6
@@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "sysdep.h"
*/
#include "sysdep.h"
@@
-599,7
+595,7
@@
void imap_greeting(void)
IAPuts("* OK [");
imap_output_capability_string();
IAPuts("* OK [");
imap_output_capability_string();
- IAPrintf("] %s IMAP4rev1 %s ready\r\n",
config.c_fqdn
, CITADEL);
+ IAPrintf("] %s IMAP4rev1 %s ready\r\n",
CtdlGetConfigStr("c_fqdn")
, CITADEL);
IUnbuffer();
}
IUnbuffer();
}
@@
-917,7
+913,7
@@
void imap_select(int num_parms, ConstStr *Params)
IAPrintf("* %d RECENT\r\n", new);
IAPrintf("* OK [UIDVALIDITY %ld] UID validity status\r\n", GLOBAL_UIDVALIDITY_VALUE);
IAPrintf("* %d RECENT\r\n", new);
IAPrintf("* OK [UIDVALIDITY %ld] UID validity status\r\n", GLOBAL_UIDVALIDITY_VALUE);
- IAPrintf("* OK [UIDNEXT %ld] Predicted next UID\r\n", C
itControl.MMhighest
+ 1);
+ IAPrintf("* OK [UIDNEXT %ld] Predicted next UID\r\n", C
tdlGetConfigLong("MMhighest")
+ 1);
/* Technically, \Deleted is a valid flag, but not a permanent flag,
* because we don't maintain its state across sessions. Citadel
/* Technically, \Deleted is a valid flag, but not a permanent flag,
* because we don't maintain its state across sessions. Citadel
@@
-1220,7
+1216,7
@@
void imap_status(int num_parms, ConstStr *Params)
IPutStr(imaproomname, len);
IAPrintf(" (MESSAGES %d ", msgs);
IAPrintf("RECENT %d ", new); /* Initially, new==recent */
IPutStr(imaproomname, len);
IAPrintf(" (MESSAGES %d ", msgs);
IAPrintf("RECENT %d ", new); /* Initially, new==recent */
- IAPrintf("UIDNEXT %ld ", C
itControl.MMhighest
+ 1);
+ IAPrintf("UIDNEXT %ld ", C
tdlGetConfigLong("MMhighest")
+ 1);
IAPrintf("UNSEEN %d)\r\n", new);
/*
IAPrintf("UNSEEN %d)\r\n", new);
/*
@@
-1675,7
+1671,7
@@
void imap_logout(int num_parms, ConstStr *Params)
if (IMAP->selected) {
imap_do_expunge(); /* yes, we auto-expunge at logout */
}
if (IMAP->selected) {
imap_do_expunge(); /* yes, we auto-expunge at logout */
}
- IAPrintf("* BYE %s logging out\r\n",
config.c_fqdn
);
+ IAPrintf("* BYE %s logging out\r\n",
CtdlGetConfigStr("c_fqdn")
);
IReply("OK Citadel IMAP session ended.");
CC->kill_me = KILLME_CLIENT_LOGGED_OUT;
return;
IReply("OK Citadel IMAP session ended.");
CC->kill_me = KILLME_CLIENT_LOGGED_OUT;
return;
@@
-1744,10
+1740,10
@@
CTDL_MODULE_INIT(imap)
if (!threading)
{
CtdlRegisterDebugFlagHook(HKEY("imapsrv"), SetIMAPDebugEnabled, &IMAPDebugEnabled);
if (!threading)
{
CtdlRegisterDebugFlagHook(HKEY("imapsrv"), SetIMAPDebugEnabled, &IMAPDebugEnabled);
- CtdlRegisterServiceHook(
config.c_imap_port
,
+ CtdlRegisterServiceHook(
CtdlGetConfigInt("c_imap_port")
,
NULL, imap_greeting, imap_command_loop, NULL, CitadelServiceIMAP);
#ifdef HAVE_OPENSSL
NULL, imap_greeting, imap_command_loop, NULL, CitadelServiceIMAP);
#ifdef HAVE_OPENSSL
- CtdlRegisterServiceHook(
config.c_imaps_port
,
+ CtdlRegisterServiceHook(
CtdlGetConfigInt("c_imaps_port")
,
NULL, imaps_greeting, imap_command_loop, NULL, CitadelServiceIMAPS);
#endif
CtdlRegisterSessionHook(imap_cleanup_function, EVT_STOP, PRIO_STOP + 30);
NULL, imaps_greeting, imap_command_loop, NULL, CitadelServiceIMAPS);
#endif
CtdlRegisterSessionHook(imap_cleanup_function, EVT_STOP, PRIO_STOP + 30);