On fredagen den 28 september 2007, Tom Kistner wrote:
> Magnus Holmgren wrote:
> > Debian users can install libdkim0 and specify just
> >
> > EXPERIMENTAL_DKIM=yes
> > LDFLAGS += -ldkim
> >
> > ... I hope. How much did you fork it?
>
> I added two items to the struct it returns for verification details, so
> I'm afraid this will not work. Yet. I'll see if I can work with Alt-N to
> get these (and more) changes incorporated into mainline libdkim.
So if I'm not mistaken, ignoring the issue of building on Linux (I solved
that in a more minimal way, so to speak) and the nowsp compatibility
canonicalization code, it all boils down to the following?
diff -w -xdebian -ur libdkim-1.0.14/src/dkim.h libdkim-1.0.15-tk/src/dkim.h
--- libdkim-1.0.14/src/dkim.h 2007-05-03 17:53:09.000000000 +0200
+++ libdkim-1.0.15-tk/src/dkim.h 2007-09-28 13:08:04.000000000 +0200
@@ -137,6 +137,8 @@
{
char *szSignature;
char *DNS;
+ char *Domain;
+ char *IdentityDomain;
int nResult;
} DKIMVerifyDetails;
diff -w -xdebian -ur libdkim-1.0.14/src/dkimverify.cpp libdkim-1.0.15-tk/src/dkimverify.cpp
--- libdkim-1.0.14/src/dkimverify.cpp 2007-04-24 11:01:58.000000000 +0200
+++ libdkim-1.0.15-tk/src/dkimverify.cpp 2007-09-28 08:05:01.000000000 +0200
@@ -1428,6 +1386,11 @@
DKIMVerifyDetails d;
d.szSignature = (char*)i->Header.c_str();
d.nResult = i->Status;
+
+ d.Domain = (char*)i->Domain.c_str();
+ d.IdentityDomain = i->IdentityDomain.empty()?(char*)i->IdentityDomain.c_str():(char*)i->Domain.c_str();
+
Details.push_back(d);
}
--
Magnus Holmgren holmgren@???
(No Cc of list mail needed, thanks)
