fix warnings - remove variables no longer needed

[citadel.git] / citadel / internet_addressing.c

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index c2131cbff46ce421a37225fb78b21772dbd9ceba..d7473e8529687a8eac87868bd3714aecb9568327 100644 (file)
--- 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 {
@@ -1165,6 +1176,7 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
  * message text.
  */
 int convert_field(struct CtdlMessage *msg, const char *beg, const char *end) {
+       struct CitContext *CCC = CC;
        char *key, *value, *valueend;
        long len;
        const char *pos;
@@ -1214,11 +1226,11 @@ int convert_field(struct CtdlMessage *msg, const char *beg, const char *end) {
 
        else if (!strcasecmp(key, "From")) {
                process_rfc822_addr(value, user, node, name);
-               syslog(LOG_DEBUG, "Converted to <%s@%s> (%s)\n", user, node, name);
+               MSG_syslog(LOG_DEBUG, "Converted to <%s@%s> (%s)\n", user, node, name);
                snprintf(addr, sizeof(addr), "%s@%s", user, node);
-               if (CM_IsEmpty(msg, eAuthor))
+               if (CM_IsEmpty(msg, eAuthor) && !IsEmptyStr(name))
                        CM_SetField(msg, eAuthor, name, strlen(name));
-               if (CM_IsEmpty(msg, erFc822Addr))
+               if (CM_IsEmpty(msg, erFc822Addr) && !IsEmptyStr(addr))
                        CM_SetField(msg, erFc822Addr, addr, strlen(addr));
                processed = 1;
        }
@@ -1519,6 +1531,7 @@ char *rfc822_fetch_field(const char *rfc822, const char *fieldname) {
 void directory_key(char *key, char *addr) {
        int i;
        int keylen = 0;
+       struct CitContext *CCC = CC;
 
        for (i=0; !IsEmptyStr(&addr[i]); ++i) {
                if (!isspace(addr[i])) {
@@ -1527,7 +1540,7 @@ void directory_key(char *key, char *addr) {
        }
        key[keylen++] = 0;
 
-       syslog(LOG_DEBUG, "Directory key is <%s>\n", key);
+       MSG_syslog(LOG_DEBUG, "Directory key is <%s>\n", key);
 }
 
 
@@ -1569,10 +1582,11 @@ void CtdlDirectoryInit(void) {
  */
 int CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) {
        char key[SIZ];
+       struct CitContext *CCC = CC;
 
        if (IsDirectory(internet_addr, 0) == 0) 
                return 0;
-       syslog(LOG_DEBUG, "Create directory entry: %s --> %s\n", internet_addr, citadel_addr);
+       MSG_syslog(LOG_DEBUG, "Create directory entry: %s --> %s\n", internet_addr, citadel_addr);
        directory_key(key, internet_addr);
        cdb_store(CDB_DIRECTORY, key, strlen(key), citadel_addr, strlen(citadel_addr)+1 );
        return 1;
@@ -1587,8 +1601,9 @@ int CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) {
  */
 int CtdlDirectoryDelUser(char *internet_addr, char *citadel_addr) {
        char key[SIZ];
-
-       syslog(LOG_DEBUG, "Delete directory entry: %s --> %s\n", internet_addr, citadel_addr);
+       struct CitContext *CCC = CC;
+       
+       MSG_syslog(LOG_DEBUG, "Delete directory entry: %s --> %s\n", internet_addr, citadel_addr);
        directory_key(key, internet_addr);
        return cdb_delete(CDB_DIRECTORY, key, strlen(key) ) == 0;
 }