Update version number and copyright year.

[exim.git] / src / src / routers / ipliteral.c

diff --git a/src/src/routers/ipliteral.c b/src/src/routers/ipliteral.c
index b091c4e61c8ae5e363cd641fd2d7b6f8a1a12d2f..df41e35b2f8784ffdb40a8d62f914eb212d0abb5 100644 (file)
--- a/src/src/routers/ipliteral.c
+++ b/src/src/routers/ipliteral.c
@@ -1,10 +1,10 @@
-/* $Cambridge: exim/src/src/routers/ipliteral.c,v 1.4 2005/01/11 15:51:03 ph10 Exp $ */
+/* $Cambridge: exim/src/src/routers/ipliteral.c,v 1.9 2007/01/08 10:50:20 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2005 */
+/* Copyright (c) University of Cambridge 1995 - 2007 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
@@ -90,7 +90,7 @@ ipliteral_router_entry(
   router_instance *rblock,        /* data for this instantiation */
   address_item *addr,             /* address we are working on */
   struct passwd *pw,              /* passwd entry after check_local_user */
-  BOOL verify,                    /* TRUE when verifying */
+  int verify,                     /* v_none/v_recipient/v_sender/v_expn */
   address_item **addr_local,      /* add it to this if it's local */
   address_item **addr_remote,     /* add it to this if it's remote */
   address_item **addr_new,        /* put new addresses on here */
@@ -102,8 +102,9 @@ ipliteral_router_options_block *ob =
 */
 host_item *h;
 uschar *domain = addr->domain;
+uschar *ip;
 int len = Ustrlen(domain);
-int rc;
+int rc, ipv;
 
 addr_new = addr_new;         /* Keep picky compilers happy */
 addr_succeed = addr_succeed;
@@ -111,14 +112,20 @@ addr_succeed = addr_succeed;
 DEBUG(D_route) debug_printf("%s router called for %s: domain = %s\n",
   rblock->name, addr->address, addr->domain);
 
-/* Check that the domain is an IP address enclosed in square brackets. If
-not, the router declines. Otherwise route to the single IP address, setting the
-host name to "(unnamed)". */
+/* Check that the domain is an IP address enclosed in square brackets. Remember
+to allow for the "official" form of IPv6 addresses. If not, the router
+declines. Otherwise route to the single IP address, setting the host name to
+"(unnamed)". */
 
 if (domain[0] != '[' || domain[len-1] != ']') return DECLINE;
 domain[len-1] = 0;  /* temporarily */
 
-if (string_is_ip_address(domain+1, NULL) == 0)
+ip = domain + 1;
+if (strncmpic(ip, US"IPV6:", 5) == 0 || strncmpic(ip, US"IPV4:", 5) == 0)
+  ip += 5;
+
+ipv = string_is_ip_address(ip, NULL);
+if (ipv == 0 || (disable_ipv6 && ipv == 6))
   {
   domain[len-1] = ']';
   return DECLINE;
@@ -128,10 +135,10 @@ if (string_is_ip_address(domain+1, NULL) == 0)
 but if it is set, it should probably work. */
 
 if (verify_check_this_host(&(rblock->ignore_target_hosts), NULL, domain,
-      domain + 1, NULL) == OK)
+      ip, NULL) == OK)
   {
   DEBUG(D_route)
-      debug_printf("%s is in ignore_target_hosts\n", domain+1);
+      debug_printf("%s is in ignore_target_hosts\n", ip);
   addr->message = US"IP literal host explicitly ignored";
   domain[len-1] = ']';
   return DECLINE;
@@ -142,7 +149,7 @@ if (verify_check_this_host(&(rblock->ignore_target_hosts), NULL, domain,
 h = store_get(sizeof(host_item));
 
 h->next = NULL;
-h->address = string_copy(domain+1);
+h->address = string_copy(ip);
 h->port = PORT_NONE;
 domain[len-1] = ']';   /* restore */
 h->name = string_copy(domain);