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

Increased the size of the nntp username and password fields to 32 characters

Browse Source
This commit is contained in:
Michiel Broek 2008-11-26 20:46:01 +00:00
parent 6e4249d51a
commit 07c23fd9a7
3 changed files with 49 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,6 +1,9 @@
$Id$ $Id$
v0.95.4 31-Aug-2008 v0.95.4 31-Aug-2008 -
upgrade:
Start mbsetup, enter global menu, leave and save.
mbnntp: mbnntp:
A cosmetic change to add an extra newline before the tearline. A cosmetic change to add an extra newline before the tearline.
@ -8,6 +11,10 @@ v0.95.4 31-Aug-2008
mbfido: mbfido:
A cosmetic change to add an extra newline before the tearline. A cosmetic change to add an extra newline before the tearline.
mbsetup:
Increased the size of the nntp username and password fields to
32 characters.
script: script:
installinit.sh now knows about Slamd64. installinit.sh now knows about Slamd64.

7
lib/mbselib.h
View File

@ -1259,8 +1259,8 @@ struct sysconfig {
unsigned modereader : 1; /* NNTP Mode Reader */ unsigned modereader : 1; /* NNTP Mode Reader */
unsigned allowcontrol : 1; /* Allow control messages */ unsigned allowcontrol : 1; /* Allow control messages */
unsigned dontregate : 1; /* Don't regate gated msgs */ unsigned dontregate : 1; /* Don't regate gated msgs */
char nntpuser[16]; /* NNTP username */ char xnntpuser[16]; /* NNTP username */
char nntppass[16]; /* NNTP password */ char xnntppass[16]; /* NNTP password */
int nntpdupes; /* NNTP dupes database size */ int nntpdupes; /* NNTP dupes database size */
int newsfeed; /* Newsfeed mode */ int newsfeed; /* Newsfeed mode */
int maxarticles; /* Default max articles */ int maxarticles; /* Default max articles */
@ -1287,6 +1287,9 @@ struct sysconfig {
char myfqdn[64]; /* My real FQDN */ char myfqdn[64]; /* My real FQDN */
int www_mailerlines; /* Limit mailhistory lines */ int www_mailerlines; /* Limit mailhistory lines */
char nntpuser[32]; /* NNTP username */
char nntppass[32]; /* NNTP password */
}; };

58
mbsetup/m_global.c
View File

@ -900,12 +900,12 @@ void s_intmailcfg(void)
mbse_mvprintw(17, 1, "11. UUCP aka"); mbse_mvprintw(17, 1, "11. UUCP aka");
mbse_mvprintw(18, 1, "12. Emailmode"); mbse_mvprintw(18, 1, "12. Emailmode");
mbse_mvprintw(13,42, "13. Articles"); mbse_mvprintw(13,48, "13. Articles");
mbse_mvprintw(14,42, "14. News mode"); mbse_mvprintw(14,48, "14. News mode");
mbse_mvprintw(15,42, "15. Split at"); mbse_mvprintw(15,48, "15. Split at");
mbse_mvprintw(16,42, "16. Force at"); mbse_mvprintw(16,48, "16. Force at");
mbse_mvprintw(17,42, "17. Control ok"); mbse_mvprintw(17,48, "17. Control ok");
mbse_mvprintw(18,42, "18. No regate"); mbse_mvprintw(18,48, "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);
@ -914,8 +914,8 @@ void s_intmailcfg(void)
switch (CFG.newsfeed) { switch (CFG.newsfeed) {
case FEEDINN: 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,31, CFG.nntpuser);
show_str(14,16,15, (char *)"**************"); show_str(14,16,31, (char *)"*******************************");
break; break;
case FEEDRNEWS: show_str(10,16,64, CFG.rnewspath); case FEEDRNEWS: show_str(10,16,64, CFG.rnewspath);
break; break;
@ -929,12 +929,12 @@ void s_intmailcfg(void)
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,65, CFG.maxarticles);
show_newsmode(14,57, CFG.newsfeed); show_newsmode(14,65, CFG.newsfeed);
show_int( 15,57, CFG.new_split); show_int( 15,65, CFG.new_split);
show_int( 16,57, CFG.new_force); show_int( 16,65, CFG.new_force);
show_bool(17,57, CFG.allowcontrol); show_bool(17,65, CFG.allowcontrol);
show_bool(18,57, CFG.dontregate); show_bool(18,65, CFG.dontregate);
} }
@ -1000,8 +1000,10 @@ void e_intmailcfg(void)
strcpy(CFG.nntpnode, edit_str(11,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; break;
case 6: E_BOOL(12,16, CFG.modereader, "Does the NNTP server needs the ^Mode Reader^ command.") 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 7: E_STR( 13,16,31, 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 8: strcpy(CFG.nntppass, edit_str(14,16,31, CFG.nntppass, (char *)"The ^Password^ for the NNTP server if needed."));
s_intmailcfg();
break;
case 9: E_INT( 15,16, CFG.nntpdupes, "The number of ^dupes^ to store in the news articles dupes database.") 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); case 10:tmp = PickAka((char *)"1.12.10", FALSE);
if (tmp != -1) if (tmp != -1)
@ -1015,14 +1017,14 @@ void e_intmailcfg(void)
s_intmailcfg(); s_intmailcfg();
break; break;
case 13:E_INT( 13,57, CFG.maxarticles, "Default maximum ^news articles^ to fetch") case 13:E_INT( 13,65, CFG.maxarticles, "Default maximum ^news articles^ to fetch")
case 14:CFG.newsfeed = edit_newsmode(14,57, CFG.newsfeed); case 14:CFG.newsfeed = edit_newsmode(14,65, CFG.newsfeed);
s_intmailcfg(); s_intmailcfg();
break; break;
case 15:E_IRC( 15,57, CFG.new_split, 12, 60, "Gently ^split^ messages after n kilobytes (12..60).") case 15:E_IRC( 15,65, 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 16:E_IRC( 16,65, 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 17:E_BOOL(17,65, CFG.allowcontrol, "^Allow control^ messages for news to be gated.")
case 19:E_BOOL(18,57, CFG.dontregate, "Don't ^regate^ already gated messages.") case 19:E_BOOL(18,65, CFG.dontregate, "Don't ^regate^ already gated messages.")
} }
}; };
} }
@ -1504,6 +1506,18 @@ void global_menu(void)
Syslog('+', "Main config, upgraded execute settings"); Syslog('+', "Main config, upgraded execute settings");
} }
if (strlen(CFG.xnntpuser) && ! strlen(CFG.nntpuser)) {
Syslog('+', "Main config, nntp username length increased");
strncpy(CFG.nntpuser, CFG.xnntpuser, 16);
memset(&CFG.xnntpuser, 0, sizeof(CFG.xnntpuser));
}
if (strlen(CFG.xnntppass) && ! strlen(CFG.nntppass)) {
Syslog('+', "Main config, nntp password length increased");
strncpy(CFG.nntppass, CFG.xnntppass, 16);
memset(&CFG.xnntppass, 0, sizeof(CFG.xnntppass));
}
for (;;) { for (;;) {
clr_index(); clr_index();