X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Finternet_addressing.c;fp=citadel%2Finternet_addressing.c;h=a8868e954c7a12320e4567113473ccd5bb82ef72;hp=c2131cbff46ce421a37225fb78b21772dbd9ceba;hb=7c94d5bb68f1c448770d31205ec5ae12bd8a02ed;hpb=c8c89455faeb5a76d6ee2264f497b8f790e0e392

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index c2131cbff..a8868e954 100644
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -1,8 +1,19 @@
 /*
  * This file contains functions which handle the mapping of Internet addresses
  * to users on the Citadel system.
+ *
+ * Copyright (c) 1987-2015 by the citadel.org team
+ *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
+
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
@@ -281,8 +292,8 @@ int CtdlHostAlias(char *fqdn) {
 	if (fqdn == NULL) return(hostalias_nomatch);
 	if (IsEmptyStr(fqdn)) return(hostalias_nomatch);
 	if (!strcasecmp(fqdn, "localhost")) return(hostalias_localhost);
-	if (!strcasecmp(fqdn, config.c_fqdn)) return(hostalias_localhost);
-	if (!strcasecmp(fqdn, config.c_nodename)) return(hostalias_localhost);
+	if (!strcasecmp(fqdn, CtdlGetConfigStr("c_fqdn"))) return(hostalias_localhost);
+	if (!strcasecmp(fqdn, CtdlGetConfigStr("c_nodename"))) return(hostalias_localhost);
 	if (inetcfg == NULL) return(hostalias_nomatch);
 
 	config_lines = num_tokens(inetcfg, '\n');
@@ -633,7 +644,7 @@ recptypes *validate_recipients(const char *supplied_recipients,
 		case MES_LOCAL:
 			if (!strcasecmp(this_recp, "sysop")) {
 				++ret->num_room;
-				strcpy(this_recp, config.c_aideroom);
+				strcpy(this_recp, CtdlGetConfigStr("c_aideroom"));
 				if (!IsEmptyStr(ret->recp_room)) {
 					strcat(ret->recp_room, "|");
 				}
@@ -1025,7 +1036,7 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
 	int a;
 
 	strcpy(user, "");
-	strcpy(node, config.c_fqdn);
+	strcpy(node, CtdlGetConfigStr("c_fqdn"));
 	strcpy(name, "");
 
 	if (rfc822 == NULL) return;
@@ -1114,7 +1125,7 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
 		&& (haschar(node, '%')==0)
 		&& (haschar(node, '!')==0)
 	) {
-		strcpy(node, config.c_nodename);
+		strcpy(node, CtdlGetConfigStr("c_nodename"));
 	}
 
 	else {