X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Fstrlist.c;h=72a6c66981f51727c3a3f0f7f0e712e5a487be6a;hb=8ca147e634f83b185dd4cddebde78878a69f315f;hp=e8202ff8bbe18d31757dac6629c7bf51d2bff0a7;hpb=8950d42993b7148718f712b8d7e77aaa21ef14ce;p=apps%2Fpfixtools.git

diff --git a/postlicyd/strlist.c b/postlicyd/strlist.c
index e8202ff..72a6c66 100644
--- a/postlicyd/strlist.c
+++ b/postlicyd/strlist.c
@@ -16,17 +16,20 @@
 /*     products derived from this software without specific prior written     */
 /*     permission.                                                            */
 /*                                                                            */
-/*  THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND   */
-/*  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE     */
-/*  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR        */
-/*  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS    */
-/*  BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR    */
-/*  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF      */
-/*  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS  */
-/*  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN   */
-/*  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)   */
-/*  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF    */
-/*  THE POSSIBILITY OF SUCH DAMAGE.                                           */
+/*  THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY EXPRESS   */
+/*  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED         */
+/*  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE    */
+/*  DISCLAIMED.  IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY         */
+/*  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL        */
+/*  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS   */
+/*  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)     */
+/*  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,       */
+/*  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN  */
+/*  ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE           */
+/*  POSSIBILITY OF SUCH DAMAGE.                                               */
+/*                                                                            */
+/*   Copyright (c) 2006-2008 the Authors                                      */
+/*   see AUTHORS and source files for details                                 */
 /******************************************************************************/
 
 /*
@@ -681,9 +684,9 @@ static filter_result_t strlist_filter(const filter_t *filter, const query_t *que
     }
 #define LOOKUP(Flag, Field)                                                    \
     if (config->match_ ## Flag) {                                              \
-        const int len = m_strlen(query->Field);                                \
-        strlist_copy(normal, query->Field, len, false);                        \
-        strlist_copy(reverse, query->Field, len, true);                        \
+        const int len = query->Field.len;                                      \
+        strlist_copy(normal, query->Field.str, len, false);                    \
+        strlist_copy(reverse, query->Field.str, len, true);                    \
         foreach (strlist_local_t *entry, config->locals) {                     \
             if ((!entry->partial && trie_lookup(*(entry->db),                  \
                                       entry->reverse ? reverse : normal))      \
@@ -699,8 +702,8 @@ static filter_result_t strlist_filter(const filter_t *filter, const query_t *que
     }
 #define DNS(Flag, Field)                                                       \
     if (config->match_ ## Flag) {                                              \
-        const int len = m_strlen(query->Field);                                \
-        strlist_copy(normal, query->Field, len, false);                        \
+        const int len = query->Field.len;                                      \
+        strlist_copy(normal, query->Field.str, len, false);                    \
         for (uint32_t i = 0 ; len > 0 && i < config->host_offsets.len ; ++i) { \
             const char *rbl = array_ptr(config->hosts,                         \
                                         array_elt(config->host_offsets, i));   \