[Astpp-commit] SF.net SVN: astpp: [2146] trunk/astpp-ip-map.agi

[<dar...@us...>]

Revision: 2146
          http://astpp.svn.sourceforge.net/astpp/?rev=2146&view=rev
Author:   darrenkw
Date:     2007-11-01 21:25:04 -0700 (Thu, 01 Nov 2007)

Log Message:
-----------
Patch:  [ 1820688 ] bad matching for prefix in ip-map.agi

Modified Paths:
--------------
    trunk/astpp-ip-map.agi

Modified: trunk/astpp-ip-map.agi
===================================================================
--- trunk/astpp-ip-map.agi	2007-11-02 03:48:23 UTC (rev 2145)
+++ trunk/astpp-ip-map.agi	2007-11-02 04:25:04 UTC (rev 2146)
@@ -54,7 +54,8 @@
 # 	$tmp = "SELECT * FROM ip_map WHERE ip = " . $astpp_db->quote($number) 
 #		. " AND prefix IS NULL OR $extension RLIKE prefix ORDER BY LENGTH(prefix) DESC LIMIT 1";
 ###########
-
+$tmp = "SELECT * FROM ip_map WHERE ip = " . $astpp_db->quote($number)
+               . " AND prefix IN (NULL,'') OR ip = " . $astpp_db->quote($number) . " AND " . $astpp_db->quote($extension) . " RLIKE prefix ORDER BY LENGTH(prefix) DESC LIMIT 1";
 	print STDERR $tmp if $config->{debug} == 1;
 	$AGI->verbose( "$tmp\n", $verbose ) if $config->{debug} == 1;
 	$sql =


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.