Apple-2-SW
/
emailler
mirror of https://github.com/bobbimanners/emailler.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix default NNTP port and allow skipping of client authentication to NNTP server

This commit is contained in:
Greg Wildman 2021-06-17 16:51:49 +02:00
parent 07bc9b40d8
commit 332a5bb7e1
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
apps/nntp65.up.c
View File

@ -369,7 +369,7 @@ void readconfigfile(void) {
colon = strchr(cfg_server, ':');
if (!colon)
nntp_port = 110;
nntp_port = 119;
else
nntp_port = atoi(colon + 1);
}
@ -645,19 +645,22 @@ sendmessage:
if (expect(buf, "200 ")) // "200" if posting is allowed
error_exit();
sprintf(sendbuf, "AUTHINFO USER %s\r\n", cfg_user);
if (!w5100_tcp_send_recv(sendbuf, buf, NETBUFSZ, DO_SEND, CMD_MODE)) {
error_exit();
}
if (expect(buf, "381")) // Username accepted
error_exit();
// Skip authentication?
if (strcmp(cfg_user, "-") != 0) {
sprintf(sendbuf, "AUTHINFO USER %s\r\n", cfg_user);
if (!w5100_tcp_send_recv(sendbuf, buf, NETBUFSZ, DO_SEND, CMD_MODE)) {
error_exit();
}
if (expect(buf, "381")) // Username accepted
error_exit();
sprintf(sendbuf, "AUTHINFO PASS %s\r\n", cfg_pass);
if (!w5100_tcp_send_recv(sendbuf, buf, NETBUFSZ, DO_SEND, CMD_MODE)) {
error_exit();
sprintf(sendbuf, "AUTHINFO PASS %s\r\n", cfg_pass);
if (!w5100_tcp_send_recv(sendbuf, buf, NETBUFSZ, DO_SEND, CMD_MODE)) {
error_exit();
}
if (expect(buf, "281")) // Authentication successful
error_exit();
}
if (expect(buf, "281")) // Authentication successful
error_exit();
connected = 1;
}