* strlen holy war: loops. in loops it's very evil. the easy ones go away now.

[citadel.git] / citadel / internet_addressing.c

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 0ec59ce34825674cd6a18a34407c7572b3604e75..ae8a6ceed7c0c31f1d170bff6492c4eadad2208c 100644 (file)
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -5,10 +5,6 @@
  * to users on the Citadel system.
  */
 
-#ifdef DLL_EXPORT
-#define IN_LIBCIT
-#endif
-
 #include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
@@ -36,7 +32,6 @@
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include "serv_extensions.h"
 #include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
@@ -74,7 +69,7 @@ int CtdlHostAlias(char *fqdn) {
        char host[256], type[256];
 
        if (fqdn == NULL) return(hostalias_nomatch);
-       if (strlen(fqdn) == 0) 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);
@@ -98,6 +93,10 @@ int CtdlHostAlias(char *fqdn) {
                   && (!strcasecmp(&fqdn[strlen(fqdn)-strlen(host)], host)))
                        return(hostalias_directory);
 
+               if ( (!strcasecmp(type, "masqdomain"))
+                  && (!strcasecmp(&fqdn[strlen(fqdn)-strlen(host)], host)))
+                       return(hostalias_masq);
+
        }
 
        return(hostalias_nomatch);
@@ -116,16 +115,17 @@ int CtdlHostAlias(char *fqdn) {
  */
 int fuzzy_match(struct ctdluser *us, char *matchstring) {
        int a;
+       long len;
 
        if ( (!strncasecmp(matchstring, "cit", 3)) 
           && (atol(&matchstring[3]) == us->usernum)) {
                return 0;
        }
 
-
-       for (a=0; a<strlen(us->fullname); ++a) {
+       len = strlen(matchstring);
+       for (a=0; !IsEmptyStr(&us->fullname[a]); ++a) {
                if (!strncasecmp(&us->fullname[a],
-                  matchstring, strlen(matchstring))) {
+                  matchstring, len)) {
                        return 0;
                }
        }
@@ -168,12 +168,14 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
        strcpy(node, config.c_fqdn);
        strcpy(name, "");
 
+       if (rfc822 == NULL) return;
+
        /* extract full name - first, it's From minus <userid> */
        strcpy(name, rfc822);
        stripout(name, '<', '>');
 
        /* strip anything to the left of a bang */
-       while ((strlen(name) > 0) && (haschar(name, '!') > 0))
+       while ((!IsEmptyStr(name)) && (haschar(name, '!') > 0))
                strcpy(name, &name[1]);
 
        /* and anything to the right of a @ or % */
@@ -193,7 +195,7 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
        /* but if there are a set of quotes, that supersedes everything */
        if (haschar(rfc822, 34) == 2) {
                strcpy(name, rfc822);
-               while ((strlen(name) > 0) && (name[0] != 34)) {
+               while ((!IsEmptyStr(name)) && (name[0] != 34)) {
                        strcpy(&name[0], &name[1]);
                }
                strcpy(&name[0], &name[1]);
@@ -213,7 +215,7 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
        }
 
        /* strip anything to the left of a bang */
-       while ((strlen(user) > 0) && (haschar(user, '!') > 0))
+       while ((!IsEmptyStr(user)) && (haschar(user, '!') > 0))
                strcpy(user, &user[1]);
 
        /* and anything to the right of a @ or % */
@@ -248,15 +250,15 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
        else {
 
                /* strip anything to the left of a @ */
-               while ((strlen(node) > 0) && (haschar(node, '@') > 0))
+               while ((!IsEmptyStr(node)) && (haschar(node, '@') > 0))
                        strcpy(node, &node[1]);
        
                /* strip anything to the left of a % */
-               while ((strlen(node) > 0) && (haschar(node, '%') > 0))
+               while ((!IsEmptyStr(node)) && (haschar(node, '%') > 0))
                        strcpy(node, &node[1]);
        
                /* reduce multiple system bang paths to node!user */
-               while ((strlen(node) > 0) && (haschar(node, '!') > 1))
+               while ((!IsEmptyStr(node)) && (haschar(node, '!') > 1))
                        strcpy(node, &node[1]);
        
                /* now get rid of the user portion of a node!user string */
@@ -274,7 +276,7 @@ void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
         * but no name outside the brackets, we now have an empty name.  In
         * this case, use the user portion of the address as the name.
         */
-       if ((strlen(name) == 0) && (strlen(user) > 0)) {
+       if ((IsEmptyStr(name)) && (!IsEmptyStr(user))) {
                strcpy(name, user);
        }
 }
@@ -383,6 +385,18 @@ int convert_field(struct CtdlMessage *msg, int beg, int end) {
                processed = 1;
        }
 
+       else if (!strcasecmp(key, "Return-Path")) {
+               if (msg->cm_fields['P'] == NULL)
+                       msg->cm_fields['P'] = strdup(value);
+               processed = 1;
+       }
+
+       else if (!strcasecmp(key, "Envelope-To")) {
+               if (msg->cm_fields['V'] == NULL)
+                       msg->cm_fields['V'] = strdup(value);
+               processed = 1;
+       }
+
        /* Clean up and move on. */
        free(key);      /* Don't free 'value', it's actually the same buffer */
        return(processed);
@@ -539,7 +553,7 @@ void directory_key(char *key, char *addr) {
        int i;
        int keylen = 0;
 
-       for (i=0; i<strlen(addr); ++i) {
+       for (i=0; !IsEmptyStr(&addr[i]); ++i) {
                if (!isspace(addr[i])) {
                        key[keylen++] = tolower(addr[i]);
                }
@@ -554,7 +568,7 @@ void directory_key(char *key, char *addr) {
 /* Return nonzero if the supplied address is in a domain we keep in
  * the directory
  */
-int IsDirectory(char *addr) {
+int IsDirectory(char *addr, int allow_masq_domains) {
        char domain[256];
        int h;
 
@@ -563,6 +577,9 @@ int IsDirectory(char *addr) {
 
        h = CtdlHostAlias(domain);
 
+       if ( (h == hostalias_masq) && allow_masq_domains)
+               return(1);
+       
        if ( (h == hostalias_localhost) || (h == hostalias_directory) ) {
                return(1);
        }
@@ -588,7 +605,7 @@ void CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) {
 
        lprintf(CTDL_DEBUG, "Dir: %s --> %s\n",
                internet_addr, citadel_addr);
-       if (IsDirectory(internet_addr) == 0) return;
+       if (IsDirectory(internet_addr, 0) == 0) return;
 
        directory_key(key, internet_addr);
 
@@ -627,7 +644,7 @@ int CtdlDirectoryLookup(char *target, char *internet_addr, size_t targbuflen) {
        if (num_tokens(internet_addr, '@') != 2) return(-1);
 
        /* Only do lookups for domains in the directory */
-       if (IsDirectory(internet_addr) == 0) return(-1);
+       if (IsDirectory(internet_addr, 0) == 0) return(-1);
 
        directory_key(key, internet_addr);
        cdbrec = cdb_fetch(CDB_DIRECTORY, key, strlen(key) );
@@ -664,7 +681,7 @@ char *harvest_collected_addresses(struct CtdlMessage *msg) {
                strcat(addr, " <");
                strcat(addr, msg->cm_fields['F']);
                strcat(addr, ">");
-               if (IsDirectory(msg->cm_fields['F'])) {
+               if (IsDirectory(msg->cm_fields['F'], 0)) {
                        is_harvestable = 0;
                }
        }
@@ -691,7 +708,7 @@ char *harvest_collected_addresses(struct CtdlMessage *msg) {
                                if ( (h != hostalias_localhost) && (h != hostalias_directory) ) {
                                        coll = realloc(coll, strlen(coll) + strlen(addr) + 4);
                                        if (coll == NULL) return(NULL);
-                                       if (strlen(coll) > 0) {
+                                       if (!IsEmptyStr(coll)) {
                                                strcat(coll, ",");
                                        }
                                        striplt(addr);
@@ -701,7 +718,7 @@ char *harvest_collected_addresses(struct CtdlMessage *msg) {
                }
        }
 
-       if (strlen(coll) == 0) {
+       if (IsEmptyStr(coll)) {
                free(coll);
                return(NULL);
        }