diff --git a/ChangeLog b/ChangeLog index e98299d0..7b0f9e66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +v1.0.6.7 28-Jun-2016 - Andrew Leary + + 1. Added the ability to disable cross-zone SEEN-BY + stripping to mbfido. This is currently a global toggle, + defaulting to strip SEEN-BYs when crossing zone boundaries. + In situations where this behavior is not desired, toggle the + SBstrip option to "No" in mbsetup 1.11.20. If there is + enough call for it, I will consider making this configurable + on a group and/or area basis. + v1.0.6.6 23-Jun-2016 - Andrew Leary 1. Several spelling and grammar corrections in mbsebbs.c, diff --git a/configure b/configure index 70585e3a..ba56ab11 100755 --- a/configure +++ b/configure @@ -2309,7 +2309,7 @@ SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbutils mbnntp mbtask mbsetup unix lang PACKAGE="mbsebbs" MAJOR="1" MINOR="0" -REVISION="6.6" +REVISION="6.7" VERSION="$MAJOR.$MINOR.$REVISION" COPYRIGHT="Copyright (C) 1997-2016 Michiel Broek, All Rights Reserved" SHORTRIGHT="Copyright (C) 1997-2016 M. Broek" diff --git a/configure.ac b/configure.ac index 667179c7..2681ff84 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_SUBST(SUBDIRS) PACKAGE="mbsebbs" MAJOR="1" MINOR="0" -REVISION="6.6" +REVISION="6.7" VERSION="$MAJOR.$MINOR.$REVISION" COPYRIGHT="Copyright (C) 1997-2016 Michiel Broek, All Rights Reserved" SHORTRIGHT="Copyright (C) 1997-2016 M. Broek" diff --git a/lib/mbselib.h b/lib/mbselib.h index e4896434..675cccb4 100644 --- a/lib/mbselib.h +++ b/lib/mbselib.h @@ -1274,6 +1274,7 @@ struct sysconfig { unsigned ca_Notify : 1; /* Areamgr: Notify on/off */ unsigned ca_Passwd : 1; /* Areamgr: Passwd change */ unsigned ca_Pause : 1; /* Areamgr: Allow Pause */ + unsigned ca_SBstrip : 1; /* Strip SB out-of-zone */ unsigned ca_Check : 1; /* Flag for upgrade check */ char rulesdir[65]; /* Area rules directory */ diff --git a/mbfido/postecho.c b/mbfido/postecho.c index f558b8fd..127fae30 100644 --- a/mbfido/postecho.c +++ b/mbfido/postecho.c @@ -338,7 +338,7 @@ int postecho(faddr *p_from, faddr *f, faddr *t, char *orig, char *subj, time_t m */ if (!dupe && !isbad) { - if (msgs.Aka.zone != Link.aka.zone) { + if ((msgs.Aka.zone != Link.aka.zone) && (CFG.ca_SBstrip)) { /* * If it is a zonegated echomailmessage the SEEN-BY lines * are stripped off including that of the other zone's diff --git a/mbsetup/m_global.c b/mbsetup/m_global.c index e2633361..e983c427 100644 --- a/mbsetup/m_global.c +++ b/mbsetup/m_global.c @@ -776,13 +776,14 @@ void s_fidomailcfg(void) mbse_mvprintw(17, 1, "11. Max systems"); mbse_mvprintw(18, 1, "12. Max groups"); - mbse_mvprintw(12,42, "13. 4d address"); - mbse_mvprintw(13,42, "14. Split at"); - mbse_mvprintw(14,42, "15. Force at"); - mbse_mvprintw(15,42, "16. Allow +*"); - mbse_mvprintw(16,42, "17. Notify"); - mbse_mvprintw(17,42, "18. Passwd"); - mbse_mvprintw(18,42, "19. Pause"); + mbse_mvprintw(11,42, "13. 4d address"); + mbse_mvprintw(12,42, "14. Split at"); + mbse_mvprintw(13,42, "15. Force at"); + mbse_mvprintw(14,42, "16. Allow +*"); + mbse_mvprintw(15,42, "17. Notify"); + mbse_mvprintw(16,42, "18. Passwd"); + mbse_mvprintw(17,42, "19. Pause"); + mbse_mvprintw(18,42, "20. SB strip"); set_color(WHITE, BLACK); show_str( 7,16,64, CFG.badboard); @@ -798,13 +799,14 @@ void s_fidomailcfg(void) show_int( 17,16, CFG.toss_systems); show_int( 18,16, CFG.toss_groups); - show_bool(12,58, CFG.addr4d); - show_int( 13,58, CFG.new_split); - show_int( 14,58, CFG.new_force); - show_bool(15,58, CFG.ca_PlusAll); - show_bool(16,58, CFG.ca_Notify); - show_bool(17,58, CFG.ca_Passwd); - show_bool(18,58, CFG.ca_Pause); + show_bool(11,58, CFG.addr4d); + show_int( 12,58, CFG.new_split); + show_int( 13,58, CFG.new_force); + show_bool(14,58, CFG.ca_PlusAll); + show_bool(15,58, CFG.ca_Notify); + show_bool(16,58, CFG.ca_Passwd); + show_bool(17,58, CFG.ca_Pause); + show_bool(18,58, CFG.ca_SBstrip); } @@ -815,7 +817,7 @@ void e_fidomailcfg(void) s_fidomailcfg(); for (;;) { - switch(select_menu(19)) { + switch(select_menu(20)) { case 0: return; case 1: E_JAM( 7,16,64, CFG.badboard, "The path to the ^bad echomail^ board.") case 2: E_JAM( 8,16,64, CFG.dupboard, "The path to the ^dupe echomail^ board.") @@ -851,13 +853,14 @@ void e_fidomailcfg(void) CloseNoderec(TRUE); } break; - case 13:E_BOOL(12,58, CFG.addr4d, "Use ^4d^ addressing instead of ^5d^ addressing.") - case 14:E_IRC( 13,58, CFG.new_split, 12, 60, "Gently ^split^ newfiles reports after n kilobytes (12..60).") - case 15:E_IRC( 14,58, CFG.new_force, 16, 64, "Force ^split^ of newfiles reports after n kilobytes (16..64).") - case 16:E_BOOL(15,58, CFG.ca_PlusAll, "Allow ^+%*^ (Plus all) in AreaMgr requests.") - case 17:E_BOOL(16,58, CFG.ca_Notify, "Allow turning ^Notify^ messages on or off.") - case 18:E_BOOL(17,58, CFG.ca_Passwd, "Allow changing the AreaMgr/FileMgr ^password^.") - case 19:E_BOOL(18,58, CFG.ca_Pause, "Allow the ^Pause^ AreaMgr command.") + case 13:E_BOOL(11,58, CFG.addr4d, "Use ^4d^ addressing instead of ^5d^ addressing.") + case 14:E_IRC( 12,58, CFG.new_split, 12, 60, "Gently ^split^ newfiles reports after n kilobytes (12..60).") + case 15:E_IRC( 13,58, CFG.new_force, 16, 64, "Force ^split^ of newfiles reports after n kilobytes (16..64).") + case 16:E_BOOL(14,58, CFG.ca_PlusAll, "Allow ^+%*^ (Plus all) in AreaMgr requests.") + case 17:E_BOOL(15,58, CFG.ca_Notify, "Allow turning ^Notify^ messages on or off.") + case 18:E_BOOL(16,58, CFG.ca_Passwd, "Allow changing the AreaMgr/FileMgr ^password^.") + case 19:E_BOOL(17,58, CFG.ca_Pause, "Allow the ^Pause^ AreaMgr command.") + case 20:E_BOOL(18,58, CFG.ca_SBstrip, "Strip SEEN-BYs across zones.") } } } diff --git a/mbtask/mbtask.c b/mbtask/mbtask.c index da2d8933..9e58cbbf 100644 --- a/mbtask/mbtask.c +++ b/mbtask/mbtask.c @@ -313,6 +313,7 @@ void load_maincfg(void) CFG.ca_Notify = TRUE; CFG.ca_Passwd = TRUE; CFG.ca_Pause = TRUE; + CFG.ca_SBstrip = TRUE; CFG.ca_Check = TRUE; for (i = 0; i < 32; i++) {