* Finished the inbound side of gateway domain service

[citadel.git] / citadel / internet_addressing.c

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index e788da27e0087639a88431532d357c3d0b69eacd..0c00d9fe3a3b39d9cd7ccb70f87927055168b8e0 100644 (file)
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -315,11 +315,9 @@ int convert_internet_address(char *destuser, char *desthost, char *source)
        char buf[256];
        int passes = 0;
        char sourcealias[1024];
-       int msgtype = 0;
 
        safestrncpy(sourcealias, source, sizeof(sourcealias) );
-       msgtype = alias(sourcealias);
-       lprintf(9, "msgtype(1) for <%s> is %d\n", msgtype, user);
+       alias(sourcealias);
 
 REALIAS:
        /* Split it up */
@@ -350,8 +348,7 @@ REALIAS:
                 * a few times, in case we accidentally hit an alias loop
                 */
                strcpy(sourcealias, user);
-               msgtype = alias(user);
-               lprintf(9, "msgtype(2) for <%s> is %d\n", msgtype, user);
+               alias(user);
                if ( (strcasecmp(user, sourcealias)) && (++passes < 3) )
                        goto REALIAS;
 
@@ -380,7 +377,8 @@ REALIAS:
 
        strcpy(destuser, user);
        strcpy(desthost, node);
-       if (msgtype == MES_BINARY) return(rfc822_address_on_citadel_network);
+       if (hostalias == hostalias_gatewaydomain)
+               return(rfc822_address_on_citadel_network);
        return(rfc822_address_nonlocal);
 }