//
// NNTP server module (RFC 3977)
//
-// Copyright (c) 2014 by the citadel.org team
+// Copyright (c) 2014-2018 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 version 3.
}
// Display the standard greeting
- cprintf("200 %s NNTP Citadel server is not finished yet\r\n", config.c_fqdn);
+ cprintf("200 %s NNTP Citadel server is not finished yet\r\n", CtdlGetConfigStr("c_fqdn"));
}
void nntp_capabilities(void)
{
cprintf("101 Capability list:\r\n");
- cprintf("IMPLEMENTATION Citadel v%d.%02d\r\n", (REV_LEVEL/100), (REV_LEVEL%100));
+ cprintf("IMPLEMENTATION Citadel %d\r\n", REV_LEVEL);
cprintf("VERSION 2\r\n");
cprintf("READER\r\n");
cprintf("MODE-READER\r\n");
//
void nntp_authinfo_user(const char *username)
{
- int a = CtdlLoginExistingUser(NULL, username);
+ int a = CtdlLoginExistingUser(username);
switch (a) {
case login_already_logged_in:
cprintf("482 Already logged in\r\n");
return;
case login_too_many_users:
- cprintf("481 Too many users are already online (maximum is %d)\r\n", config.c_maxsessions);
+ cprintf("481 Too many users are already online (maximum is %d)\r\n", CtdlGetConfigInt("c_maxsessions"));
return;
case login_ok:
cprintf("381 Password required for %s\r\n", CC->curr_user);
if (msgnum < lr->lo) return;
if ((lr->hi != 0) && (msgnum > lr->hi)) return;
- struct CtdlMessage *msg = CtdlFetchMessage(msgnum, 0);
+ struct CtdlMessage *msg = CtdlFetchMessage(msgnum, 0, 1);
if (msg == NULL) {
return;
}
}
const char *CitadelServiceNNTP="NNTP";
+const char *CitadelServiceNNTPS="NNTPS";
CTDL_MODULE_INIT(nntp)
{
if (!threading)
{
- CtdlRegisterServiceHook(119, // FIXME config.c_nntp_port,
+ CtdlRegisterServiceHook(CtdlGetConfigInt("c_nntp_port"),
NULL,
nntp_greeting,
nntp_command_loop,
CitadelServiceNNTP);
#ifdef HAVE_OPENSSL
- CtdlRegisterServiceHook(563, // FIXME config.c_nntps_port,
+ CtdlRegisterServiceHook(CtdlGetConfigInt("c_nntps_port"),
NULL,
nntps_greeting,
nntp_command_loop,
NULL,
- CitadelServiceNNTP);
+ CitadelServiceNNTPS);
#endif
CtdlRegisterCleanupHook(nntp_cleanup);