#include "support.h"
#include "config.h"
#include "tools.h"
+#include "msgbase.h"
#include "internet_addressing.h"
#include "user_ops.h"
#include "room_ops.h"
char host[256], type[256];
if (!strcasecmp(fqdn, config.c_fqdn)) return(hostalias_localhost);
+ if (!strcasecmp(fqdn, config.c_nodename)) return(hostalias_localhost);
if (inetcfg == NULL) return(hostalias_nomatch);
config_lines = num_tokens(inetcfg, '\n');
/*
* Return 0 if a given string fuzzy-matches a Citadel user account
*
- * FIX ... this needs to be updated to handle aliases.
+ * FIXME ... this needs to be updated to handle aliases.
*/
int fuzzy_match(struct usersupp *us, char *matchstring) {
int a;
/*
* Split an RFC822-style address into userid, host, and full name
- * (Originally from citmail.c, and unchanged so far)
*
*/
void process_rfc822_addr(char *rfc822, char *user, char *node, char *name)
if (node[a] == '>')
node[a] = 0;
}
- /* strip anything to the left of a @ */
- while ((strlen(node) > 0) && (haschar(node, '@') > 0))
- strcpy(node, &node[1]);
- /* strip anything to the left of a % */
- while ((strlen(node) > 0) && (haschar(node, '%') > 0))
- strcpy(node, &node[1]);
+ /* If no node specified, tack ours on instead */
+ if (
+ (haschar(node, '@')==0)
+ && (haschar(node, '%')==0)
+ && (haschar(node, '!')==0)
+ ) {
+ strcpy(node, config.c_nodename);
+ }
- /* reduce multiple system bang paths to node!user */
- while ((strlen(node) > 0) && (haschar(node, '!') > 1))
- strcpy(node, &node[1]);
+ else {
- /* now get rid of the user portion of a node!user string */
- for (a = 0; a < strlen(node); ++a)
- if (node[a] == '!')
- node[a] = 0;
+ /* strip anything to the left of a @ */
+ while ((strlen(node) > 0) && (haschar(node, '@') > 0))
+ strcpy(node, &node[1]);
+
+ /* strip anything to the left of a % */
+ while ((strlen(node) > 0) && (haschar(node, '%') > 0))
+ strcpy(node, &node[1]);
+
+ /* reduce multiple system bang paths to node!user */
+ while ((strlen(node) > 0) && (haschar(node, '!') > 1))
+ strcpy(node, &node[1]);
+
+ /* now get rid of the user portion of a node!user string */
+ for (a = 0; a < strlen(node); ++a)
+ if (node[a] == '!')
+ node[a] = 0;
+ }
/* strip leading and trailing spaces in all strings */
striplt(user);
int hostalias;
struct trynamebuf tnb;
char buf[256];
+ int passes = 0;
+ char sourcealias[1024];
+
+ safestrncpy(sourcealias, source, sizeof(sourcealias) );
+ alias(sourcealias);
+REALIAS:
/* Split it up */
- process_rfc822_addr(source, user, node, name);
+ process_rfc822_addr(sourcealias, user, node, name);
+ lprintf(9, "process_rfc822_addr() converted to <%s@%s> (%s)\n",
+ user, node, name);
/* Map the FQDN to a Citadel node name
*/
}
/* Now try to resolve the name
- * FIX ... do the multiple-addresses thing
+ * FIXME ... do the multiple-addresses thing
*/
if (!strcasecmp(node, config.c_nodename)) {
+
+
+ /* First, see if we hit an alias. Don't do this more than
+ * a few times, in case we accidentally hit an alias loop
+ */
+ strcpy(sourcealias, user);
+ alias(user);
+ if ( (strcasecmp(user, sourcealias)) && (++passes < 3) )
+ goto REALIAS;
+
/* Try all local rooms */
if (!strncasecmp(user, "room_", 5)) {
strcpy(name, &user[5]);
strcpy(destuser, user);
strcpy(desthost, node);
- return(rfc822_address_invalid); /* unknown error */
+ if (hostalias == hostalias_gatewaydomain)
+ return(rfc822_address_on_citadel_network);
+ return(rfc822_address_nonlocal);
}