Changeset 387:dc344c0405d3 for alias.c

Timestamp:

1998-08-23 03:05:27 (10 years ago)

Author:

Thomas Roessler <roessler@…>

Branch:

mutt-0-94

Message:

[patch-0.94.3i.tlr.hidden_host.1] Replace the
--enable-hidden-host configure switch by a configuration
variable $hidden_host which can be changed at run-time.
This variable will _not_ affect the generation of
message-IDs since we'll get into uniqueness problems if we
just use the domain here.

Needs to be documented.

Files:

• alias.c (modified) (5 diffs)

alias.c

@@ -39 +39 @@
   LIST *u;
   char i;
-
+  const char *fqdn;
+  
   while (a)
   {
@@ -109 +110 @@
   }
 
-  if (option (OPTUSEDOMAIN) && Fqdn && Fqdn[0] != '@')
+  if (option (OPTUSEDOMAIN) && (fqdn = mutt_fqdn(1)))
   {
     /* now qualify all local addresses */
-    rfc822_qualify (head, Fqdn);
+    rfc822_qualify (head, fqdn);
   }
 
@@ -373 +374 @@
 }
 
+static int string_is_address(const char *str, const char *u, const char *d)
+{
+  char buf[LONG_STRING];
+  
+  snprintf(buf, sizeof(buf), "%s@%s", NONULL(u), NONULL(d));
+  if (strcasecmp(str, buf) == 0)
+    return 1;
+  
+  return 0;
+}
+
 /* returns TRUE if the given address belongs to the user. */
 int mutt_addr_is_user (ADDRESS *addr)
 {
-  char buf[LONG_STRING];
-
   /* NULL address is assumed to be the user. */
   if (!addr)
@@ -383 +393 @@
   if (!addr->mailbox)
     return 0;
+
   if (strcasecmp (addr->mailbox, NONULL(Username)) == 0)
     return 1;
-  snprintf (buf, sizeof (buf), "%s@%s", NONULL(Username), NONULL(Hostname));
-  if (strcasecmp (addr->mailbox, buf) == 0)
-    return 1;
-  snprintf (buf, sizeof (buf), "%s@%s", NONULL(Username), NONULL(Fqdn));
-  if (strcasecmp (addr->mailbox, buf) == 0)
+  if(string_is_address(addr->mailbox, Username, Hostname))
+    return 1;
+  if(string_is_address(addr->mailbox, Username, mutt_fqdn(0)))
+    return 1;
+  if(string_is_address(addr->mailbox, Username, mutt_fqdn(1)))
     return 1;
 
@@ -395 +406 @@
       regexec (Alternates.rx, addr->mailbox, 0, NULL, 0) == 0)
     return 1;
+  
   return 0;
 }