From 13ae7323003334393343dfedac03c75e51c22be9 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Mon, 29 Oct 2007 23:20:45 +0000 Subject: (domain_name_cmp): Yet another bugfix git-svn-id: file:///svnroot/mailfromd/trunk@1525 7a8a7f39-df28-0410-adc6-e0d955640f24 --- src/dnsbase.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/dnsbase.c b/src/dnsbase.c index 28c88988..3d063166 100644 --- a/src/dnsbase.c +++ b/src/dnsbase.c @@ -273,18 +273,20 @@ domain_name_cmp(const char *ptr, const char *name, const char *domain) while (*name && *ptr) if (c = *ptr++ - *name++) return c; - if (*domain && *ptr != '.') - return *ptr - *domain; - ptr++; - while (*domain && *ptr) - if (c = *ptr++ - *domain++) - return c; - if (*domain == '.' && domain[1] == 0) - domain++; - if (*ptr == '.' && ptr[1] == 0) + if (*domain) { + if (*ptr != '.') + return *ptr - *domain; ptr++; - if (*domain || *ptr) - return 1; + while (*domain && *ptr) + if (c = *ptr++ - *domain++) + return c; + if (*domain == '.' && domain[1] == 0) + domain++; + if (*ptr == '.' && ptr[1] == 0) + ptr++; + if (*domain || *ptr) + return 1; + } return 0; } -- cgit v1.2.1