git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
2592e6c
)
Merge branch 'master' into 4.next
author
Jeremy Harris
<jgh146exb@wizmail.org>
Tue, 2 Feb 2016 11:46:50 +0000
(11:46 +0000)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Tue, 2 Feb 2016 12:26:15 +0000
(12:26 +0000)
src/src/pdkim/pdkim.c
patch
|
blob
|
history
diff --git
a/src/src/pdkim/pdkim.c
b/src/src/pdkim/pdkim.c
index 789d650e6530f653e2bcfd9a6d0d1439195de6be..2d5f621b4da6c9ba16dc97d01741bc68eb6ef604 100644
(file)
--- a/
src/src/pdkim/pdkim.c
+++ b/
src/src/pdkim/pdkim.c
@@
-1443,14
+1443,10
@@
if ( pdkim_headcat(&col, hdr, ";", "a=", pdkim_algos[sig->algo])
if (!i)
if (!pdkim_headcat(&col, hdr, NULL, NULL, ":"))
- {
goto BAIL;
- }
if (!pdkim_headcat(&col, hdr, s, i, n))
- {
goto BAIL;
- }
if (!c)
break;
@@
-1476,7
+1472,7
@@
if ( pdkim_headcat(&col, hdr, ";", "a=", pdkim_algos[sig->algo])
snprintf(minibuf, 20, "%lu", sig->created);
if(!pdkim_headcat(&col, hdr, ";", "t=", minibuf))
goto BAIL;
- }
+
}
if (sig->expires > 0)
{
@@
-1503,7
+1499,7
@@
if ( pdkim_headcat(&col, hdr, ";", "a=", pdkim_algos[sig->algo])
goto BAIL;
if (!pdkim_headcat(&col, hdr, ";", "b=", base64_b))
goto BAIL;
- }
+
}
else
if(!pdkim_headcat(&col, hdr, ";", "b=", ""))
goto BAIL;