X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnntp%2Fserv_nntp.c;h=b5b91db791b8d02a1bb98212088a60005266633d;hb=6050cb23108ee10dafcceb65b9cafab51c013ae0;hp=1e686d3bc1cc92b53299c66af109333f2507a74d;hpb=78d67438d8eb34ece9946f1bc9c2a8410cbf166c;p=citadel.git

diff --git a/citadel/modules/nntp/serv_nntp.c b/citadel/modules/nntp/serv_nntp.c
index 1e686d3bc..b5b91db79 100644
--- a/citadel/modules/nntp/serv_nntp.c
+++ b/citadel/modules/nntp/serv_nntp.c
@@ -533,8 +533,8 @@ void nntp_list(const char *cmd) {
 		cprintf("Date:\r\n");
 		cprintf("Message-ID:\r\n");
 		cprintf("References:\r\n");
-		cprintf(":bytes\r\n");
-		cprintf(":lines\r\n");
+		cprintf("Bytes:\r\n");
+		cprintf("Lines:\r\n");
 		cprintf(".\r\n");
 		return;
 	}
@@ -686,7 +686,8 @@ void nntp_mode(const char *cmd) {
 	extract_token(which_mode, cmd, 1, ' ', sizeof which_mode);
 
 	if (!strcasecmp(which_mode, "reader")) {
-		cprintf("201 Reader mode FIXME implement posting and change to 200\r\n");
+		// FIXME implement posting and change to 200
+		cprintf("201 Reader mode activated\r\n");
 	}
 	else {
 		cprintf("501 unknown mode\r\n");
@@ -770,7 +771,7 @@ void nntp_article(const char *cmd) {
 	// We don't know how to do that yet.
 	else if ( (lb != NULL) && (rb != NULL) && (lb < rb) ) {
 		must_change_currently_selected_article = 0;
-		cprintf("500 FIXME I don't know how to fetch by message-id yet.\r\n");
+		cprintf("500 I don't know how to fetch by message-id yet.\r\n");	// FIXME
 		return;
 	}
 
@@ -1171,12 +1172,13 @@ void nntp_cleanup_function(void)
 }
 
 const char *CitadelServiceNNTP="NNTP";
+const char *CitadelServiceNNTPS="NNTPS";
 
 CTDL_MODULE_INIT(nntp)
 {
 	if (!threading)
 	{
-		CtdlRegisterServiceHook(119,			// FIXME config.c_nntp_port,
+		CtdlRegisterServiceHook(config.c_nntp_port,
 					NULL,
 					nntp_greeting,
 					nntp_command_loop,
@@ -1184,12 +1186,12 @@ CTDL_MODULE_INIT(nntp)
 					CitadelServiceNNTP);
 
 #ifdef HAVE_OPENSSL
-		CtdlRegisterServiceHook(563,			// FIXME config.c_nntps_port,
+		CtdlRegisterServiceHook(config.c_nntps_port,
 					NULL,
 					nntps_greeting,
 					nntp_command_loop,
 					NULL,
-					CitadelServiceNNTP);
+					CitadelServiceNNTPS);
 #endif
 
 		CtdlRegisterCleanupHook(nntp_cleanup);