Skip to content

Commit 0035df5

Browse files
committed
opendkim: remove smfi_insheader() stub, require libmilter >= sendmail 8.13.0
smfi_insheader() has been in libmilter since sendmail 8.13.0 (2004). Remove the compatibility stub and the HAVE_SMFI_INSHEADER guards; always call smfi_insheader() directly. Fixes #89
1 parent ecf7d40 commit 0035df5

1 file changed

Lines changed: 0 additions & 30 deletions

File tree

opendkim/opendkim.c

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -785,32 +785,6 @@ pthread_mutex_t pwdb_lock; /* passwd/group lock */
785785
** BEGIN private section
786786
*/
787787

788-
#ifndef HAVE_SMFI_INSHEADER
789-
/*
790-
** SMFI_INSHEADER -- stub for smfi_insheader() which didn't exist before
791-
** sendmail 8.13.0
792-
**
793-
** Parameters:
794-
** ctx -- milter context
795-
** idx -- insertion index
796-
** hname -- header name
797-
** hvalue -- header value
798-
**
799-
** Return value:
800-
** An sfsistat.
801-
*/
802-
803-
sfsistat
804-
smfi_insheader(SMFICTX *ctx, int idx, char *hname, char *hvalue)
805-
{
806-
assert(ctx != NULL);
807-
assert(hname != NULL);
808-
assert(hvalue != NULL);
809-
810-
return smfi_addheader(ctx, hname, hvalue);
811-
}
812-
#endif /* ! HAVE_SMFI_INSHEADER */
813-
814788
/*
815789
** DKIMF_GETPRIV -- wrapper for smfi_getpriv()
816790
**
@@ -876,11 +850,7 @@ dkimf_insheader(SMFICTX *ctx, int idx, char *hname, char *hvalue)
876850
if (testmode)
877851
return dkimf_test_insheader(ctx, idx, hname, hvalue);
878852
else
879-
#ifdef HAVE_SMFI_INSHEADER
880853
return smfi_insheader(ctx, idx, hname, hvalue);
881-
#else /* HAVE_SMFI_INSHEADER */
882-
return smfi_addheader(ctx, hname, hvalue);
883-
#endif /* HAVE_SMFI_INSHEADER */
884854
}
885855

886856
/*

0 commit comments

Comments
 (0)