Milter-greylist

On Sun, 2006-01-22 at 16:08 +0200, Sysadmin wrote:
> 
> Hello.
> >
> > Put your #undef AF_INET6 into milter-greylist.h just after the
> #includes
> > instead of having it in pending.c.
> >   
> Damn, I already happily announced, that it works, but then it's stuck 
> again with new error:
> 
> pending.o: In function `pending_get':
> /home/soft/meilindus/milter-greylist-2.1.2/pending.c:186: undefined 
> reference to `F2B'
> /home/soft/meilindus/milter-greylist-2.1.2/pending.c:186: undefined 
> reference to `F2B'
> /home/soft/meilindus/milter-greylist-2.1.2/pending.c:186: undefined 
> reference to `F2B'
> /home/soft/meilindus/milter-greylist-2.1.2/pending.c:186: undefined 
> reference to `F2B'
> /home/soft/meilindus/milter-greylist-2.1.2/pending.c:186: undefined 
> reference to `F2B'
> pending.o:/home/soft/meilindus/milter-greylist-2.1.2/pending.c:186:
> more 
> undefined references to `F2B' follow
> collect2: ld returned 1 exit status

This is a little bug in miter-greylist.h...

Apply this patch and then add that #undef.

Emmanuel: This one could go for 2.1.3...

Regards,

R.

---PATCH---
diff -u milter-greylist-2.1.2/milter-greylist.h milter-greylist-2.1.2-fix/milter-greylist.h
--- milter-greylist-2.1.2/milter-greylist.h     2006-01-08 02:38:25.000000000 +0200
+++ milter-greylist-2.1.2-fix/milter-greylist.h 2006-01-22 16:31:11.777240668 +0200
@@ -79,13 +79,14 @@
 #define SADDR6(sa)     (&SA6(sa)->sin6_addr)
 #endif

-#ifdef AF_INET6
 /* Notes:
  * -For IPv6 not using s6_addr32 as Solaris 8 for some reason has it only defined for its kernel...
  * -Using also first two characters in "from" and "rcpt" to distribute potentially lot of triplets
  *  coming from a single host (first two chars only because "<>" is the "shortest" email address)
  */
 #define F2B(s) (tolower((int)*(s)) | (tolower((int)*((s)+1)) << 8))
+
+#ifdef AF_INET6
 #define BUCKET_HASH(sa, from, rcpt, bucket_count)      \
        (sa->sa_family == AF_INET ? \
          ((ntohl(SADDR4(sa)->s_addr) ^ F2B(from) ^ F2B(rcpt)) \
---PATCH---