bbs/deb-mbse
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix against hang when pop3 login fails

Browse Source
This commit is contained in:
Michiel Broek 2004-06-24 19:43:42 +00:00
parent 41b1428c5f
commit 8efb45e7a3
3 changed files with 69 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -16,6 +16,7 @@ v0.61.1 20-Jun-2004.
mbsebbs: mbsebbs:
Added user@domain login for pop3 mailboxes. Added user@domain login for pop3 mailboxes.
If pop3 login fails, the bbs won't hang.
mbsetup: mbsetup:
Added user@domain login for pop3 servers in screen 1.12. Added user@domain login for pop3 servers in screen 1.12.

9
mbsebbs/pop3.c
View File

@ -43,10 +43,6 @@
void error_popmail(char *); void error_popmail(char *);
void error_popmail(char *umsg) void error_popmail(char *umsg)
{ {
char *p;
pop3_send((char *)"QUIT\r\n");
p = pop3_receive();
pop3_close(); pop3_close();
colour(LIGHTRED, BLACK); colour(LIGHTRED, BLACK);
printf("%s\r\n", umsg); printf("%s\r\n", umsg);
@ -136,7 +132,10 @@ void check_popmail(char *user, char *pass)
/* /*
* If nothing is retrieved from the POP3 mailbox, the user sees nothing. * If nothing is retrieved from the POP3 mailbox, the user sees nothing.
*/ */
Syslog('+', "POP3: connect user %s", user); if (CFG.UsePopDomain)
Syslog('+', "POP3: connect user %s@%s", user, CFG.sysdomain);
else
Syslog('+', "POP3: connect user %s", user);
if (pop3_connect() == -1) { if (pop3_connect() == -1) {
WriteError("Can't connect POP3 server"); WriteError("Can't connect POP3 server");
return; return;

121
mbsetup/m_global.c
View File

@ -865,66 +865,73 @@ void e_fidomailcfg(void)
void s_intmailcfg(void); void s_intmailcfg(void);
void s_intmailcfg(void) void s_intmailcfg(void)
{ {
clr_index(); clr_index();
set_color(WHITE, BLACK); set_color(WHITE, BLACK);
mvprintw( 5, 5, "1.12 EDIT INTERNET MAIL AND NEWS PROCESSING"); mvprintw( 5, 5, "1.12 EDIT INTERNET MAIL AND NEWS PROCESSING");
set_color(CYAN, BLACK); set_color(CYAN, BLACK);
mvprintw( 7, 2, "1. POP3 node"); mvprintw( 7, 2, "1. POP3 node");
mvprintw( 8, 2, "2. User@domain"); mvprintw( 8, 2, "2. Usr@domain");
mvprintw( 9, 2, "3. SMTP node"); mvprintw( 9, 2, "3. SMTP node");
switch (CFG.newsfeed) { switch (CFG.newsfeed) {
case FEEDINN: mvprintw(10, 2, "4. N/A"); case FEEDINN: mvprintw(10, 2, "4. N/A");
mvprintw(11, 2, "5. NNTP node"); mvprintw(11, 2, "5. NNTP node");
mvprintw(12, 2, "6. NNTP m.r."); mvprintw(12, 2, "6. NNTP m.r.");
mvprintw(13, 2, "7. NNTP user"); mvprintw(13, 2, "7. NNTP user");
mvprintw(14, 2, "8. NNTP pass"); mvprintw(14, 2, "8. NNTP pass");
break; break;
case FEEDRNEWS: mvprintw(10, 2, "4. Path rnews"); case FEEDRNEWS: mvprintw(10, 2, "4. Path rnews");
mvprintw(11, 2, "5. N/A"); mvprintw(11, 2, "5. N/A");
mvprintw(12, 2, "6. N/A"); mvprintw(12, 2, "6. N/A");
mvprintw(13, 2, "7. N/A"); mvprintw(13, 2, "7. N/A");
mvprintw(14, 2, "8. N/A"); mvprintw(14, 2, "8. N/A");
break; break;
case FEEDUUCP: mvprintw(10, 2, "4. UUCP path"); case FEEDUUCP: mvprintw(10, 2, "4. UUCP path");
mvprintw(11, 2, "5. UUCP node"); mvprintw(11, 2, "5. UUCP node");
mvprintw(12, 2, "6. N/A"); mvprintw(12, 2, "6. N/A");
mvprintw(13, 2, "7. N/A"); mvprintw(13, 2, "7. N/A");
mvprintw(14, 2, "8. N/A"); mvprintw(14, 2, "8. N/A");
break; break;
} }
mvprintw(15, 2, "9. News dupes"); mvprintw(15, 2, "9. News dupes");
mvprintw(16, 1, "10. Email aka"); mvprintw(16, 1, "10. Email aka");
mvprintw(17, 1, "11. UUCP aka"); mvprintw(17, 1, "11. UUCP aka");
mvprintw(18, 1, "12. Emailmode"); mvprintw(18, 1, "12. Emailmode");
mvprintw(12,42, "13. Articles"); mvprintw(13,42, "13. Articles");
mvprintw(13,42, "14. News mode"); mvprintw(14,42, "14. News mode");
mvprintw(14,42, "15. Split at"); mvprintw(15,42, "15. Split at");
mvprintw(15,42, "16. Force at"); mvprintw(16,42, "16. Force at");
mvprintw(16,42, "17. Control ok"); mvprintw(17,42, "17. Control ok");
mvprintw(17,42, "18. No regate"); mvprintw(18,42, "18. No regate");
set_color(WHITE, BLACK); set_color(WHITE, BLACK);
show_str( 7,16,64, CFG.popnode); show_str( 7,16,64, CFG.popnode);
show_bool(8,16, CFG.UsePopDomain); show_bool(8,16, CFG.UsePopDomain);
show_str( 9,16,64, CFG.smtpnode); show_str( 9,16,64, CFG.smtpnode);
show_str(10,16,64, CFG.rnewspath); switch (CFG.newsfeed) {
show_str(11,16,64, CFG.nntpnode); case FEEDINN: show_str(11,16,64, CFG.nntpnode);
show_bool(12,16, CFG.modereader); show_bool(12,16, CFG.modereader);
show_str(13,16,15, CFG.nntpuser); show_str(13,16,15, CFG.nntpuser);
show_str(14,16,15, (char *)"**************"); show_str(14,16,15, (char *)"**************");
break;
case FEEDRNEWS: show_str(10,16,64, CFG.rnewspath);
break;
case FEEDUUCP: show_str(10,16,64, CFG.rnewspath);
show_str(11,16,64, CFG.nntpnode);
break;
}
show_int(15,16, CFG.nntpdupes); show_int(15,16, CFG.nntpdupes);
show_aka(16,16, CFG.EmailFidoAka); show_aka(16,16, CFG.EmailFidoAka);
show_aka(17,16, CFG.UUCPgate); show_aka(17,16, CFG.UUCPgate);
show_emailmode(18,16, CFG.EmailMode); show_emailmode(18,16, CFG.EmailMode);
show_int( 13,57, CFG.maxarticles); show_int( 13,57, CFG.maxarticles);
show_newsmode(14,57, CFG.newsfeed); show_newsmode(14,57, CFG.newsfeed);
show_int( 15,57, CFG.new_split); show_int( 15,57, CFG.new_split);
show_int( 16,57, CFG.new_force); show_int( 16,57, CFG.new_force);
show_bool(17,57, CFG.allowcontrol); show_bool(17,57, CFG.allowcontrol);
show_bool(18,57, CFG.dontregate); show_bool(18,57, CFG.dontregate);
} }
@ -977,7 +984,7 @@ void e_intmailcfg(void)
switch(select_menu(18)) { switch(select_menu(18)) {
case 0: return; case 0: return;
case 1: E_STR( 7,16,64, CFG.popnode, "The ^FQDN^ of the node where the ^POP3^ server runs.") case 1: E_STR( 7,16,64, CFG.popnode, "The ^FQDN^ of the node where the ^POP3^ server runs.")
case 2: E_BOOL( 8,16, CFG.UsePopDomain, "Use ^user@maildomain^to login the POP3 server.") case 2: E_BOOL( 8,16, CFG.UsePopDomain, "Use ^user@maildomain^ to login the POP3 server.")
case 3: E_STR( 9,16,64, CFG.smtpnode, "The ^FQDN^ of the node where the ^SMTP^ server runs.") case 3: E_STR( 9,16,64, CFG.smtpnode, "The ^FQDN^ of the node where the ^SMTP^ server runs.")
case 4: if (CFG.newsfeed == FEEDRNEWS) case 4: if (CFG.newsfeed == FEEDRNEWS)
strcpy(CFG.rnewspath, edit_pth(10,16,64, CFG.rnewspath, (char *)"The path and filename to the ^rnews^ command.", 0775)); strcpy(CFG.rnewspath, edit_pth(10,16,64, CFG.rnewspath, (char *)"The path and filename to the ^rnews^ command.", 0775));