From 41b1428c5f5c8f76143f01de77b3ec56f951ef3c Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Thu, 24 Jun 2004 19:01:58 +0000 Subject: [PATCH] Added domain login for pop3 mail --- ChangeLog | 6 ++ html/setup/global.html | 3 +- lib/mbselib.h | 2 +- mbsebbs/pop3.c | 136 +++++++++++++++++++++-------------------- mbsetup/m_global.c | 123 +++++++++++++++++++------------------ 5 files changed, 143 insertions(+), 127 deletions(-) diff --git a/ChangeLog b/ChangeLog index f735c47d..2d46f58a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,12 @@ v0.61.1 20-Jun-2004. mbnntp: If compiled in full newsmode, this program acts like a dummy. + mbsebbs: + Added user@domain login for pop3 mailboxes. + + mbsetup: + Added user@domain login for pop3 servers in screen 1.12. + v0.61.0 06-Jun-2004 - 20-Jun-2004 diff --git a/html/setup/global.html b/html/setup/global.html index 15f74236..6ceb8dcf 100644 --- a/html/setup/global.html +++ b/html/setup/global.html @@ -14,7 +14,7 @@
-
Last update 19-May-2004
+
Last update 24-Jun-2004

MBSE BBS Setup - Global Setup

In this setup you can edit all global settings for MBSE BBS. All sections will @@ -318,6 +318,7 @@ www.linuxdoc.org, it's all there. 
 POP3 node         The POP3 node to use, should be localhost
+POP3 user@domain  Use user@domain to login in the POP3 server
 SMTP node         The SMTP node to use, should be localhost
 NNTP node         The NNTP node to use, should be localhost
 NNTP m.r.         If the NNTP server needs the Mode Reader command
diff --git a/lib/mbselib.h b/lib/mbselib.h
index 0020c9d2..8f2f8e80 100644
--- a/lib/mbselib.h
+++ b/lib/mbselib.h
@@ -927,7 +927,7 @@ struct	sysconfig {
 	unsigned	xelite_mode       : 1;
 	unsigned	slow_util	  : 1;	/* Run utils slowly	    */
 	unsigned	exclude_sysop     : 1;	/* Exclude Sysop from lists */
-	unsigned	xUseSysDomain	  : 1;
+	unsigned	UsePopDomain	  : 1;	/* Add domain pop3 login    */
 	unsigned	xChkMail          : 1;
 	unsigned	iConnectString	  : 1;  /* Display Connect String   */
 	unsigned	iAskFileProtocols : 1;	/* Ask user FileProtocols   */
diff --git a/mbsebbs/pop3.c b/mbsebbs/pop3.c
index 524a61bf..192cbadd 100644
--- a/mbsebbs/pop3.c
+++ b/mbsebbs/pop3.c
@@ -129,82 +129,86 @@ void retr_msg(int msgnum)
 
 void check_popmail(char *user, char *pass)
 {
-	char	*p, *q, temp[128];
-	int	tmsgs = 0, size, msgnum, color = LIGHTBLUE;
-	FILE	*tp;
+    char	*p, *q, temp[128];
+    int	tmsgs = 0, size, msgnum, color = LIGHTBLUE;
+    FILE	*tp;
 
-	/*
-	 *  If nothing is retrieved from the POP3 mailbox, the user sees nothing.
-	 */
-	Syslog('+', "POP3: connect user %s", user);
-	if (pop3_connect() == -1) {
-		WriteError("Can't connect POP3 server");
-		return;
-	}
+    /*
+     *  If nothing is retrieved from the POP3 mailbox, the user sees nothing.
+     */
+    Syslog('+', "POP3: connect user %s", user);
+    if (pop3_connect() == -1) {
+	WriteError("Can't connect POP3 server");
+	return;
+    }
 
+    if (CFG.UsePopDomain)
+	sprintf(temp, "USER %s@%s\r\n", user, CFG.sysdomain);
+    else
 	sprintf(temp, "USER %s\r\n", user);
-	if (pop3_cmd(temp)) {
-		error_popmail((char *)"You have no email box");
-		return;
-	}
+    
+    if (pop3_cmd(temp)) {
+	error_popmail((char *)"You have no email box");
+	return;
+    }
 
-	sprintf(temp, "PASS %s\r\n", pass);
-	if (pop3_cmd(temp)) {
-		error_popmail((char *)"Wrong email password, reset your password");
-		return;
-	}
+    sprintf(temp, "PASS %s\r\n", pass);
+    if (pop3_cmd(temp)) {
+	error_popmail((char *)"Wrong email password, reset your password");
+	return;
+    }
 
-	Syslog('+', "POP3: logged in");
+    Syslog('+', "POP3: logged in");
 
-	pop3_send((char *)"STAT\r\n");
-	p = pop3_receive();
-	if (strncmp(p, "+OK", 3) == 0) {
-		q = strtok(p, " ");
-		q = strtok(NULL, " ");
-		tmsgs = atoi(q);
-		q = strtok(NULL, " \r\n\0");
-		size = atoi(q);
-		Syslog('+', "POP3: %d messages, %d bytes", tmsgs, size);
-		if (tmsgs && ((tp = tmpfile()) != NULL)) {
-			if (pop3_cmd((char *)"LIST\r\n") == 0) {
-				while (TRUE) {
-					p = pop3_receive();
-					if (p[0] == '.') {
-						break;
-					} else {
-						q = strtok(p, " ");
-						msgnum = atoi(q);
-						fwrite(&msgnum, sizeof(msgnum), 1, tp);
-					}
-				}
-				rewind(tp);
-				while (fread(&msgnum, sizeof(msgnum), 1, tp) == 1) {
-					/*
-					 *  Show progress
-					 */
-					colour(color, BLACK);
-					printf("\rFetching message %02d/%02d, total %d bytes", msgnum, tmsgs, size);
-					fflush(stdout);
-					if (color < WHITE)
-						color++;
-					else
-						color = LIGHTBLUE;
-					retr_msg(msgnum);
-				}
-				fclose(tp);
-			}
+    pop3_send((char *)"STAT\r\n");
+    p = pop3_receive();
+    if (strncmp(p, "+OK", 3) == 0) {
+	q = strtok(p, " ");
+	q = strtok(NULL, " ");
+	tmsgs = atoi(q);
+	q = strtok(NULL, " \r\n\0");
+	size = atoi(q);
+	Syslog('+', "POP3: %d messages, %d bytes", tmsgs, size);
+	if (tmsgs && ((tp = tmpfile()) != NULL)) {
+	    if (pop3_cmd((char *)"LIST\r\n") == 0) {
+		while (TRUE) {
+		    p = pop3_receive();
+		    if (p[0] == '.') {
+			break;
+		    } else {
+			q = strtok(p, " ");
+			msgnum = atoi(q);
+			fwrite(&msgnum, sizeof(msgnum), 1, tp);
+		    }
 		}
-		fflush(stdout);
+		rewind(tp);
+		while (fread(&msgnum, sizeof(msgnum), 1, tp) == 1) {
+		    /*
+		     *  Show progress
+		     */
+		    colour(color, BLACK);
+		    printf("\rFetching message %02d/%02d, total %d bytes", msgnum, tmsgs, size);
+		    fflush(stdout);
+		    if (color < WHITE)
+			color++;
+		    else
+			color = LIGHTBLUE;
+		    retr_msg(msgnum);
+		}
+		fclose(tp);
+	    }
 	}
+	fflush(stdout);
+    }
 
-	pop3_cmd((char *)"QUIT\r\n");
-	pop3_close();
+    pop3_cmd((char *)"QUIT\r\n");
+    pop3_close();
 
-	if (tmsgs) {
-		colour(LIGHTMAGENTA, BLACK);
-		printf("\r                                                \r");
-		fflush(stdout);
-	}
+    if (tmsgs) {
+	colour(LIGHTMAGENTA, BLACK);
+	printf("\r                                                \r");
+	fflush(stdout);
+    }
 }
 
 
diff --git a/mbsetup/m_global.c b/mbsetup/m_global.c
index bbb92335..ffc7ceb2 100644
--- a/mbsetup/m_global.c
+++ b/mbsetup/m_global.c
@@ -870,59 +870,61 @@ void s_intmailcfg(void)
         mvprintw( 5, 5, "1.12   EDIT INTERNET MAIL AND NEWS PROCESSING");
         set_color(CYAN, BLACK);
         mvprintw( 7, 2, "1. POP3 node");
-        mvprintw( 8, 2, "2. SMTP node");
+	mvprintw( 8, 2, "2. User@domain");
+        mvprintw( 9, 2, "3. SMTP node");
 	switch (CFG.newsfeed) {
-		case FEEDINN:	mvprintw( 9, 2, "3. N/A");
-        			mvprintw(10, 2, "4. NNTP node");
-				mvprintw(11, 2, "5. NNTP m.r.");
-				mvprintw(12, 2, "6. NNTP user");
-				mvprintw(13, 2, "7. NNTP pass");
+		case FEEDINN:	mvprintw(10, 2, "4. N/A");
+        			mvprintw(11, 2, "5. NNTP node");
+				mvprintw(12, 2, "6. NNTP m.r.");
+				mvprintw(13, 2, "7. NNTP user");
+				mvprintw(14, 2, "8. NNTP pass");
 				break;
-		case FEEDRNEWS: mvprintw( 9, 2, "3. Path rnews");
-				mvprintw(10, 2, "4. N/A");
+		case FEEDRNEWS: mvprintw(10, 2, "4. Path rnews");
 				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(14, 2, "8. N/A");
 				break;
-		case FEEDUUCP:	mvprintw( 9, 2, "3. UUCP path");
-				mvprintw(10, 2, "4. UUCP node");
-                                mvprintw(11, 2, "5. N/A");
+		case FEEDUUCP:	mvprintw(10, 2, "4. UUCP path");
+				mvprintw(11, 2, "5. UUCP node");
                                 mvprintw(12, 2, "6. N/A");
                                 mvprintw(13, 2, "7. N/A");
+                                mvprintw(14, 2, "8. N/A");
 				break;
 	}
-        mvprintw(14, 2, "8. News dupes");
-        mvprintw(15, 2, "9. Email aka");
-        mvprintw(16, 1, "10. UUCP aka");
-        mvprintw(17, 1, "11. Emailmode");
+        mvprintw(15, 2, "9. News dupes");
+        mvprintw(16, 1, "10. Email aka");
+        mvprintw(17, 1, "11. UUCP aka");
+        mvprintw(18, 1, "12. Emailmode");
 
-	mvprintw(12,42, "12. Articles");
-        mvprintw(13,42, "13. News mode");
-        mvprintw(14,42, "14. Split at");
-        mvprintw(15,42, "15. Force at");
-        mvprintw(16,42, "16. Control ok");
-        mvprintw(17,42, "17. No regate");
+	mvprintw(12,42, "13. Articles");
+        mvprintw(13,42, "14. News mode");
+        mvprintw(14,42, "15. Split at");
+        mvprintw(15,42, "16. Force at");
+        mvprintw(16,42, "17. Control ok");
+        mvprintw(17,42, "18. No regate");
 
         set_color(WHITE, BLACK);
         show_str( 7,16,64, CFG.popnode);
-        show_str( 8,16,64, CFG.smtpnode);
-        show_str( 9,16,64, CFG.rnewspath);
-	show_str(10,16,64, CFG.nntpnode);
-        show_bool(11,16,   CFG.modereader);
-        show_str(12,16,15, CFG.nntpuser);
-        show_str(13,16,15, (char *)"**************");
+	show_bool(8,16,    CFG.UsePopDomain);
+        show_str( 9,16,64, CFG.smtpnode);
+        show_str(10,16,64, CFG.rnewspath);
+	show_str(11,16,64, CFG.nntpnode);
+        show_bool(12,16,   CFG.modereader);
+        show_str(13,16,15, CFG.nntpuser);
+        show_str(14,16,15, (char *)"**************");
 
-        show_int(14,16,    CFG.nntpdupes);
-        show_aka(15,16,    CFG.EmailFidoAka);
-        show_aka(16,16,    CFG.UUCPgate);
-        show_emailmode(17,16, CFG.EmailMode);
+        show_int(15,16,    CFG.nntpdupes);
+        show_aka(16,16,    CFG.EmailFidoAka);
+        show_aka(17,16,    CFG.UUCPgate);
+        show_emailmode(18,16, CFG.EmailMode);
 
-	show_int( 12,57, CFG.maxarticles);
-	show_newsmode(13,57, CFG.newsfeed);
-        show_int( 14,57, CFG.new_split);
-        show_int( 15,57, CFG.new_force);
-        show_bool(16,57, CFG.allowcontrol);
-        show_bool(17,57, CFG.dontregate);
+	show_int( 13,57, CFG.maxarticles);
+	show_newsmode(14,57, CFG.newsfeed);
+        show_int( 15,57, CFG.new_split);
+        show_int( 16,57, CFG.new_force);
+        show_bool(17,57, CFG.allowcontrol);
+        show_bool(18,57, CFG.dontregate);
 }
 
 
@@ -972,44 +974,45 @@ void e_intmailcfg(void)
 
         s_intmailcfg();
         for (;;) {
-                switch(select_menu(17)) {
+                switch(select_menu(18)) {
                 case 0: return;
                 case 1: E_STR(  7,16,64, CFG.popnode,      "The ^FQDN^ of the node where the ^POP3^ server runs.")
-                case 2: E_STR(  8,16,64, CFG.smtpnode,     "The ^FQDN^ of the node where the ^SMTP^ server runs.")
-		case 3: if (CFG.newsfeed == FEEDRNEWS)
-				strcpy(CFG.rnewspath, edit_pth(9,16,64, CFG.rnewspath, (char *)"The path and filename to the ^rnews^ command.", 0775));
+		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 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));
 			if (CFG.newsfeed == FEEDUUCP)
-				strcpy(CFG.rnewspath, edit_pth(9,16,64, CFG.rnewspath, (char *)"The path to the ^uucppublic^ directory.", 0775));
+				strcpy(CFG.rnewspath, edit_pth(10,16,64, CFG.rnewspath, (char *)"The path to the ^uucppublic^ directory.", 0775));
 			break;
-                case 4: if (CFG.newsfeed == FEEDINN)
-				strcpy(CFG.nntpnode, edit_str(10,16,64, CFG.nntpnode, (char *)"The ^FQDN^ of the node where the ^NNTP^ server runs."));
+                case 5: if (CFG.newsfeed == FEEDINN)
+				strcpy(CFG.nntpnode, edit_str(11,16,64, CFG.nntpnode, (char *)"The ^FQDN^ of the node where the ^NNTP^ server runs."));
 			if (CFG.newsfeed == FEEDUUCP)
-				strcpy(CFG.nntpnode, edit_str(10,16,64, CFG.nntpnode, (char *)"The ^UUCP^ nodename of the remote UUCP system"));
+				strcpy(CFG.nntpnode, edit_str(11,16,64, CFG.nntpnode, (char *)"The ^UUCP^ nodename of the remote UUCP system"));
 			break;
-                case 5: E_BOOL(11,16,    CFG.modereader,   "Does the NNTP server needs the ^Mode Reader^ command.")
-                case 6: E_STR( 12,16,15, CFG.nntpuser,     "The ^Username^ for the NNTP server if needed.")
-                case 7: E_STR( 13,16,15, CFG.nntppass,     "The ^Password^ for the NNTP server if needed.")
-                case 8: E_INT( 14,16,    CFG.nntpdupes,    "The number of ^dupes^ to store in the news articles dupes database.")
-                case 9: tmp = PickAka((char *)"1.13.9", FALSE);
+                case 6: E_BOOL(12,16,    CFG.modereader,   "Does the NNTP server needs the ^Mode Reader^ command.")
+                case 7: E_STR( 13,16,15, CFG.nntpuser,     "The ^Username^ for the NNTP server if needed.")
+                case 8: E_STR( 14,16,15, CFG.nntppass,     "The ^Password^ for the NNTP server if needed.")
+                case 9: E_INT( 15,16,    CFG.nntpdupes,    "The number of ^dupes^ to store in the news articles dupes database.")
+		case 10:tmp = PickAka((char *)"1.12.10", FALSE);
                         if (tmp != -1)
                                 CFG.EmailFidoAka = CFG.aka[tmp];
                         s_intmailcfg();
                         break;
-                case 10:e_uucp();
+                case 11:e_uucp();
                         s_intmailcfg();
                         break;
-                case 11:CFG.EmailMode = edit_emailmode(17,16, CFG.EmailMode);
+                case 12:CFG.EmailMode = edit_emailmode(18,16, CFG.EmailMode);
                         s_intmailcfg();
                         break;
 
-		case 12:E_INT( 12,57, CFG.maxarticles,    "Default maximum ^news articles^ to fetch")
-		case 13:CFG.newsfeed = edit_newsmode(13,57, CFG.newsfeed);
+		case 13:E_INT( 13,57, CFG.maxarticles,    "Default maximum ^news articles^ to fetch")
+		case 14:CFG.newsfeed = edit_newsmode(14,57, CFG.newsfeed);
 			s_intmailcfg();
 			break;
-                case 14:E_IRC( 14,57, CFG.new_split, 12, 60, "Gently ^split^ messages after n kilobytes (12..60).")
-                case 15:E_IRC( 15,57, CFG.new_force, 16, 64, "Force ^split^ of messages after n kilobytes (16..64).")
-                case 16:E_BOOL(16,57, CFG.allowcontrol,      "^Allow control^ messages for news to be gated.")
-                case 17:E_BOOL(17,57, CFG.dontregate,        "Don't ^regate^ already gated messages.")
+                case 15:E_IRC( 15,57, CFG.new_split, 12, 60, "Gently ^split^ messages after n kilobytes (12..60).")
+                case 16:E_IRC( 16,57, CFG.new_force, 16, 64, "Force ^split^ of messages after n kilobytes (16..64).")
+                case 17:E_BOOL(17,57, CFG.allowcontrol,      "^Allow control^ messages for news to be gated.")
+                case 19:E_BOOL(18,57, CFG.dontregate,        "Don't ^regate^ already gated messages.")
                 }
         };
 }
@@ -2086,6 +2089,7 @@ int global_doc(FILE *fp, FILE *toc, int page)
     add_webtable(wp, (char *)"Email fido aka", aka2str(CFG.EmailFidoAka));
     add_webtable(wp, (char *)"UUCP gateway", aka2str(CFG.UUCPgate));
     add_webtable(wp, (char *)"POP3 host", CFG.popnode);
+    add_webtable(wp, (char *)"POP3 user@domain login", getboolean(CFG.UsePopDomain));
     add_webtable(wp, (char *)"SMTP host", CFG.smtpnode);
     add_webtable(wp, (char *)"News transfermode", getnewsmode(CFG.newsfeed));
     addtoc(fp, toc, 1, 13, page, (char *)"Internet Mail and News processing");
@@ -2095,6 +2099,7 @@ int global_doc(FILE *fp, FILE *toc, int page)
     fprintf(fp, "      Email fido aka     %s\n", aka2str(CFG.EmailFidoAka));
     fprintf(fp, "      UUCP gateway       %s\n", aka2str(CFG.UUCPgate));
     fprintf(fp, "      POP3 host          %s\n", CFG.popnode);
+    fprintf(fp, "      POP3 user@domain   %s\n", getboolean(CFG.UsePopDomain));
     fprintf(fp, "      SMTP host          %s\n", CFG.smtpnode);
     fprintf(fp, "      News transfermode  %s\n", getnewsmode(CFG.newsfeed));
     switch (CFG.newsfeed) {