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 15:58:28 +02:00
parent 82835c508d
commit 432de5ad21
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.c
View File

@ -327,7 +327,7 @@ void readconfigfile(void) {
colon = strchr(cfg_server, ':');
if (!colon)
nntp_port = 110;
nntp_port = 119;
else {
nntp_port = atoi(colon + 1);
*colon = '\0';
@ -649,19 +649,22 @@ void main(int argc, char *argv[]) {
if (expect(buf, "20")) // "200" if posting is allowed / "201" if no posting
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();
while (1) {
msg = fscanf(newsgroupsfp, "%s %s %ld", newsgroup, mailbox, &msgnum);