From 6562581c86e3306312dda194f95883d873a43bd5 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 7 Apr 2008 04:01:04 +0000 Subject: [PATCH] Removed the 'Gateway Domain' function from the entire Citadel system. This function has long since been superseded by the Global Address Book. Absolutely no one is using it. In fact, as far as I can tell, its implementation does not even exist anymore -- I couldn't find the back end code to remove. So instead of confusing site administrators with a superfluous configuration option, we are removing it. --- citadel/internet_addressing.c | 4 --- citadel/tuiconfig.c | 23 +++++++------- webcit/inetconf.c | 56 ++++++++++++++--------------------- 3 files changed, 33 insertions(+), 50 deletions(-) diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c index 6f28a69a3..3b7e0cd90 100644 --- a/citadel/internet_addressing.c +++ b/citadel/internet_addressing.c @@ -85,10 +85,6 @@ int CtdlHostAlias(char *fqdn) { && (!strcasecmp(fqdn, host))) return(hostalias_localhost); - if ( (!strcasecmp(type, "gatewaydomain")) - && (!strcasecmp(&fqdn[strlen(fqdn)-strlen(host)], host))) - return(hostalias_gatewaydomain); - if ( (!strcasecmp(type, "directory")) && (!strcasecmp(&fqdn[strlen(fqdn)-strlen(host)], host))) return(hostalias_directory); diff --git a/citadel/tuiconfig.c b/citadel/tuiconfig.c index d3a6121f8..785784722 100644 --- a/citadel/tuiconfig.c +++ b/citadel/tuiconfig.c @@ -385,27 +385,24 @@ void get_inet_rec_type(CtdlIPC *ipc, char *buf) { int sel; keyopt(" <1> localhost (Alias for this computer)\n"); - keyopt(" <2> gateway domain (Domain for all Citadel systems)\n"); - keyopt(" <3> smart-host (Forward all outbound mail to this host)\n"); - keyopt(" <4> directory (Consult the Global Address Book)\n"); - keyopt(" <5> SpamAssassin (Address of SpamAssassin server)\n"); - keyopt(" <6> RBL (domain suffix of spam hunting RBL)\n"); - keyopt(" <7> masq domains (Domains as which users are allowed to masquerade)\n"); + keyopt(" <2> smart-host (Forward all outbound mail to this host)\n"); + keyopt(" <3> directory (Consult the Global Address Book)\n"); + keyopt(" <4> SpamAssassin (Address of SpamAssassin server)\n"); + keyopt(" <5> RBL (domain suffix of spam hunting RBL)\n"); + keyopt(" <6> masq domains (Domains as which users are allowed to masquerade)\n"); sel = intprompt("Which one", 1, 1, 6); switch(sel) { case 1: strcpy(buf, "localhost"); return; - case 2: strcpy(buf, "gatewaydomain"); + case 2: strcpy(buf, "smarthost"); return; - case 3: strcpy(buf, "smarthost"); + case 3: strcpy(buf, "directory"); return; - case 4: strcpy(buf, "directory"); + case 4: strcpy(buf, "spamassassin"); return; - case 5: strcpy(buf, "spamassassin"); + case 5: strcpy(buf, "rbl"); return; - case 6: strcpy(buf, "rbl"); - return; - case 7: strcpy(buf, "masqdomain"); + case 6: strcpy(buf, "masqdomain"); return; } } diff --git a/webcit/inetconf.c b/webcit/inetconf.c index 0c03995d2..b52d5df25 100644 --- a/webcit/inetconf.c +++ b/webcit/inetconf.c @@ -1,16 +1,13 @@ /* * $Id$ + * + * Functions which handle Internet domain configuration etc. */ -/** - * \defgroup InetCfg Functions which handle Internet domain configuration etc. - * \ingroup CitadelConfig - */ -/*@{*/ -#include "webcit.h" +#include "webcit.h" -/** - * \brief display the inet config dialog +/* + * display the inet config dialog */ void display_inetconf(void) { @@ -24,48 +21,45 @@ void display_inetconf(void) enum { ic_localhost, ic_directory, - ic_gwdom, ic_smarthost, ic_rbl, ic_spamass, ic_masq, ic_max }; + char *ic_spec[ic_max]; char *ic_misc; char *ic_keyword[ic_max]; char *ic_boxtitle[ic_max]; char *ic_desc[ic_max]; - /* DON'T NEVER EVER AGAIN TRANSLATE CITADEL COMMANDS! */ + /* These are server config keywords; do not localize! */ ic_keyword[0] = "localhost"; ic_keyword[1] = "directory"; - ic_keyword[2] = "gatewaydomain"; - ic_keyword[3] = "smarthost"; - ic_keyword[4] = "rbl"; - ic_keyword[5] = "spamassassin"; - ic_keyword[6] = "masqdomain"; - + ic_keyword[2] = "smarthost"; + ic_keyword[3] = "rbl"; + ic_keyword[4] = "spamassassin"; + ic_keyword[5] = "masqdomain"; ic_boxtitle[0] = _("Local host aliases"); ic_boxtitle[1] = _("Directory domains"); - ic_boxtitle[2] = _("Gateway domains"); - ic_boxtitle[3] = _("Smart hosts"); - ic_boxtitle[4] = _("RBL hosts"); - ic_boxtitle[5] = _("SpamAssassin hosts"); - ic_boxtitle[6] = _("Masqueradable domains"); + ic_boxtitle[2] = _("Smart hosts"); + ic_boxtitle[3] = _("RBL hosts"); + ic_boxtitle[4] = _("SpamAssassin hosts"); + ic_boxtitle[5] = _("Masqueradable domains"); ic_desc[0] = _("(domains for which this host receives mail)"); ic_desc[1] = _("(domains mapped with the Global Address Book)"); - ic_desc[2] = _("(domains whose subdomains match Citadel hosts)"); - ic_desc[3] = _("(if present, forward all outbound mail to one of these hosts)"); - ic_desc[4] = _("(hosts running a Realtime Blackhole List)"); - ic_desc[5] = _("(hosts running the SpamAssassin service)"); - ic_desc[6] = _("(Domains as which users are allowed to masquerade)"); + ic_desc[2] = _("(if present, forward all outbound mail to one of these hosts)"); + ic_desc[3] = _("(hosts running a Realtime Blackhole List)"); + ic_desc[4] = _("(hosts running the SpamAssassin service)"); + ic_desc[5] = _("(Domains as which users are allowed to masquerade)"); for (i=0; i