diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 9d4590c7adf1..5039ab0bbb38 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,303 +1,303 @@
 # New ports collection makefile for:	dkim-milter
 # Date created:				10 Jan 2006
 # Whom:					Hirohisa Yamaguchi <umq@ueo.co.jp>
 #
 # $FreeBSD$
 #
 ## There is a new option WITH_POSTFIX_MILTER
 ## to make this port work with mail/postfix port.
 
 ## WITH_POSTFIX_MILTER knob implicitly defines
 ## WITH_SENDMAIL_BASE, to build with libmilter*
 ## in base system.  If you have deleted sendamil in
 ## base system, building this port may fail.
 
 PORTNAME=	dkim-milter
-PORTVERSION=	2.5.3
+PORTVERSION=	2.5.5
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	umq@ueo.co.jp
 COMMENT=	Domainkeys Identified Mail (DKIM) milter
 
 USE_RC_SUBR=	milter-dkim.sh
 USE_OPENSSL=	yes
 
 .if defined(WITH_POSTFIX_MILTER) || defined(WITH_POSTFIX) || defined(WITH_POSTFIX_CURRENT)
 WITH_SENDMAIL_BASE=	yes
 PKGMESSAGE=	pkg-message.postfix
 
 .if defined(SENDMAIL_MILTER_IN_BASE)
 WITH_SENDMAIL_BASE=yes
 .endif
 
 .if defined(WITH_POSTFIX_CURRENT)
 RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix-current
 .else
 RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix
 .endif
 .endif
 
 SUB_FILES=	milter-dkim.sh
 WCONF=		${WRKSRC}/devtools/Site
 MAN5=		dkim-filter.conf.5
 MAN8=		dkim-filter.8 dkim-genkey.8 dkim-testkey.8 dkim-testssp.8
 PLIST_FILES=	etc/mail/dkim-filter.conf.sample include/dkim.h \
 		bin/dkim-genkey %%STATS%%bin/dkim-stats bin/dkim-testkey \
 		bin/dkim-testssp %%LIBDKIM%%lib/libdkim.a \
 		%%LIBDKIMSHARED%%lib/libdkim.so %%LIBDKIMSHARED%%lib/libdkim.so.0 \
 		libexec/dkim-filter
 PLIST_DIRS=	etc/mail
 PORTDOCS=	FEATURES INSTALL KNOWNBUGS LICENSE README RELEASE_NOTES \
 		autorespond.csh \
 		draft-hoffman-dac-vbr-02.txt draft-ietf-dkim-deployment-01.txt \
 		draft-ietf-dkim-overview-09.txt draft-ietf-dkim-ssp-03.txt \
 		draft-kucherawy-sender-auth-header-14.txt \
 		rfc4686.txt rfc4871.txt rfc5016.txt
 .if !defined(NOPORTDOCS)
 LIBDOCS=	${DOCSDIR_REL}/libdkim/index.html \
 		${DOCSDIR_REL}/libdkim/overview.html \
 		${DOCSDIR_REL}/libdkim/dkim.html \
 		${DOCSDIR_REL}/libdkim/dkim_alg_t.html \
 		${DOCSDIR_REL}/libdkim/dkim_body.html \
 		${DOCSDIR_REL}/libdkim/dkim_canon_t.html \
 		${DOCSDIR_REL}/libdkim/dkim_cbstat.html \
 		${DOCSDIR_REL}/libdkim/dkim_chunk.html \
 		${DOCSDIR_REL}/libdkim/dkim_close.html \
 		${DOCSDIR_REL}/libdkim/dkim_eoh.html \
 		${DOCSDIR_REL}/libdkim/dkim_eom.html \
 		${DOCSDIR_REL}/libdkim/dkim_flush_cache.html \
 		${DOCSDIR_REL}/libdkim/dkim_free.html \
 		${DOCSDIR_REL}/libdkim/dkim_get_user_context.html \
 		${DOCSDIR_REL}/libdkim/dkim_getcachestats.html \
 		${DOCSDIR_REL}/libdkim/dkim_getdomain.html \
 		${DOCSDIR_REL}/libdkim/dkim_geterror.html \
 		${DOCSDIR_REL}/libdkim/dkim_getmode.html \
 		${DOCSDIR_REL}/libdkim/dkim_getpolicystr.html \
 		${DOCSDIR_REL}/libdkim/dkim_getpresult.html \
 		${DOCSDIR_REL}/libdkim/dkim_getpresultstr.html \
 		${DOCSDIR_REL}/libdkim/dkim_getresultstr.html \
 		${DOCSDIR_REL}/libdkim/dkim_getsighdr.html \
 		${DOCSDIR_REL}/libdkim/dkim_getsiglist.html \
 		${DOCSDIR_REL}/libdkim/dkim_getsignature.html \
 		${DOCSDIR_REL}/libdkim/dkim_header.html \
 		${DOCSDIR_REL}/libdkim/dkim_init.html \
 		${DOCSDIR_REL}/libdkim/dkim_key_syntax.html \
 		${DOCSDIR_REL}/libdkim/dkim_lib.html \
 		${DOCSDIR_REL}/libdkim/dkim_minbody.html \
 		${DOCSDIR_REL}/libdkim/dkim_ohdrs.html \
 		${DOCSDIR_REL}/libdkim/dkim_options.html \
 		${DOCSDIR_REL}/libdkim/dkim_param_t.html \
 		${DOCSDIR_REL}/libdkim/dkim_policy.html \
 		${DOCSDIR_REL}/libdkim/dkim_policy_syntax.html \
 		${DOCSDIR_REL}/libdkim/dkim_policy_t.html \
 		${DOCSDIR_REL}/libdkim/dkim_presult.html \
 		${DOCSDIR_REL}/libdkim/dkim_pstate.html \
 		${DOCSDIR_REL}/libdkim/dkim_query_t.html \
 		${DOCSDIR_REL}/libdkim/dkim_reportinfo.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_dns_callback.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_final.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_key_lookup.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_policy_lookup.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_prescreen.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_signature_handle.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_signature_handle_free.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_signature_tagvalues.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_signer.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_user_context.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_getbh.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_getcanonlen.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_getcontext.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_getdomain.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_geterror.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_geterrorstr.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_getflags.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_getkeysize.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_getselector.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_getsignalg.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_getsigntime.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_ignore.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_process.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_syntax.html \
 		${DOCSDIR_REL}/libdkim/dkim_sigerror.html \
 		${DOCSDIR_REL}/libdkim/dkim_siginfo.html \
 		${DOCSDIR_REL}/libdkim/dkim_sigkey_t.html \
 		${DOCSDIR_REL}/libdkim/dkim_sign.html \
 		${DOCSDIR_REL}/libdkim/dkim_ssl_version.html \
 		${DOCSDIR_REL}/libdkim/dkim_stat.html \
 		${DOCSDIR_REL}/libdkim/dkim_verify.html \
 		${DOCSDIR_REL}/libdkim/rfc2822_mailbox_split.html
 PLIST_FILES+=	${DOCSDIR_REL}/README.dkim-filter \
 		${DOCSDIR_REL}/README.libdkim \
 		${LIBDOCS}
 PLIST_DIRS+=	${DOCSDIR_REL}/libdkim
 .endif
 
 .include <bsd.port.pre.mk>
 
 WITHOUT_MILTER_CFLAGS=	yes
 WITHOUT_MILTER_LDFLAGS=	yes
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
 SITE+=		${FILESDIR}/site.config.m4
 .if defined(WITH_SENDMAIL_PORT)
 SITE+=		${FILESDIR}/site.config.m4.milter
 .endif
 SITE+=		${WRKSRC}/site.config.m4.dist
 SITE_SUB+=	-e "s|%%PREFIX%%|${PREFIX}|g" \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g"
 .if defined(WITH_SENDMAIL_STATIC_MILTER)
 SITE_SUB+=	-e 's|%%STATIC%%||g'
 .else
 SITE_SUB+=	-e 's|%%STATIC%%|dnl |g'
 .endif
 
 SUB_LIST=	"RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR:S/.sh$//}${RC_SUBR_SUFFIX}"
 
 .if defined(WITH_LIBDKIM_SHARED)
 .if ${ARCH} == "amd64"
 BROKEN=		The devtools do not support the feature
 .endif
 SITE_SUB+=	-e '\|bld_LIBDKIM_SHARED|s/^dnl //g'
 .else
 .endif
 .if defined(WITH_LIBDKIM_INSTALL)
 SITE_SUB+=	-e '\|bld_LIBDKIM_INSTALL|s/^dnl //g'
 .if defined(WITH_LIBDKIM_SHARED)
 PLIST_SUB+=	LIBDKIM="@comment "
 PLIST_SUB+=	LIBDKIMSHARED=""
 USE_LDCONFIG=	yes
 .else
 PLIST_SUB+=	LIBDKIM=""
 PLIST_SUB+=	LIBDKIMSHARED="@comment "
 .endif
 .else
 PLIST_SUB+=	LIBDKIM="@comment "
 PLIST_SUB+=	LIBDKIMSHARED="@comment "
 .endif
 .if defined(WITH_DEBUG)
 SITE_SUB+=	-e '\|confOPTIMIZE.*-g|s/^dnl //g'
 .endif
 .if !defined(WITHOUT_ARLIB)
 SITE_SUB+=	-e '\|bld_USE_ARLIB|s/^dnl //g'
 .endif
 .if defined(WITH_POPAUTH) && !defined(WITHOUT_POPAUTH)
 SITE_SUB+=	-e '/-DPOPAUTH/s/^dnl //g'
 .endif
 .if defined(WITH_QUERY_CACHE) && !defined(WITHOUT_QUERY_CACHE)
 SITE_SUB+=	-e '/-DQUERY_CACHE/s/^dnl //g'
 .endif
 
 .if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
 LIBDK_PORT=	mail/dk-milter
 BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/${LIBDK_PORT}:patch
 LIBDK_PATH!=	cd ${PORTSDIR}/${LIBDK_PORT} && ${MAKE} -V WRKSRC
 SITE_SUB+=	-e '\|bld_VERIFY_DOMAINKEYS|s/^dnl //'
 PORTDOCS+=	rfc4870.txt
 .endif
 
 .if defined(WITH_STATS) && !defined(WITHOUT_STATS)
 MAN8+=		dkim-stats.8
 PLIST_SUB+=	STATS=""
 .else
 PLIST_SUB+=	STATS="@comment "
 .endif
 
 .if (defined(WITH_POPAUTH) \
 	|| defined(WITH_QUERY_CACHE) \
 	|| defined(WITH_BODYLENGTH_DB) \
 	|| defined(WITH_STATS)) \
 	&& !defined(WITH_BDB_BASE)
 USE_BDB=	41+
 SITE_SUB+=	-e 's|%%BDB%%||g' \
 		-e "s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g" \
 		-e "s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g" \
 		-e "s|%%BDB_LIB_NAME%%|${BDB_LIB_NAME}|g"
 .else
 SITE_SUB+=	-e 's|%%BDB%%|dnl |g'
 .endif
 .if defined(WITH_OPENSSL_BASE) || defined(OPENSSL_OVERWRITE_BASE)
 SITE_SUB+=	-e 's|%%OPENSSL%%|dnl |g'
 .else
 SITE_SUB+=	-e 's|%%OPENSSL%%||g' \
 		-e "s|%%OPENSSLINC%%|${OPENSSLINC}|g" \
 		-e "s|%%OPENSSLLIB%%|${OPENSSLLIB}|g"
 .endif
 .if defined(WITH_DIFFHEADERS) && !defined(WITHOUT_DIFFHEADERS)
 SITE_SUB+=	-e 's|%%LIBTRE%%||g'
 LIB_DEPENDS+=	tre:${PORTSDIR}/textproc/libtre
 .else
 SITE_SUB+=	-e 's|%%LIBTRE%%|dnl |g'
 .endif
 
 pre-fetch:
 .if defined(SENDMAIL_MILTER_IN_BASE)
 	@${ECHO_MSG}
 	@${ECHO_MSG} "SENDMAIL_MILTER_IN_BASE now deprecated,"
 	@${ECHO_MSG} "please set WITH_SENDMAIL_BASE=yes instead"
 .endif
 	@${ECHO_MSG}
 	@${ECHO_MSG} "If you do not have OpenSSL 0.9.8 or later installed,"
 	@${ECHO_MSG} "set WITH_OPENSSL_PORT=yes to support rsa-sha256 algorithm"
 	@${ECHO_MSG} "which is requied in the latest specification."
 	@${ECHO_MSG}
 	@${ECHO_MSG} "dkim-milter has the following tunable option(s):"
 	@${ECHO_MSG} " WITH_POPAUTH=yes		Query POP-before-SMTP authentication database"
 	@${ECHO_MSG} " WITH_QUERY_CACHE=yes		Cache DNS Query"
 	@${ECHO_MSG} " WITH_VERIFY_DOMAINKEYS=yes	Verify DomainKeys using dk-milter's libdk"
 	@${ECHO_MSG} " WITH_SENDMAIL_BASE=yes		Build to run with base sendmail"
 	@${ECHO_MSG} " WITH_SENDMAIL_PORT=yes		Build to run with ports' sendmail"
 	@${ECHO_MSG} " WITH_POSTFIX=yes		Build to run with postfix port"
 	@${ECHO_MSG} " WITH_LIBDKIM_INSTALL=yes	Install libdkim library"
 	@${ECHO_MSG}
 	@sleep 5
 
 post-extract:
 	@${CP} ${WRKSRC}/dkim-filter/autorespond.csh ${WRKSRC}
 
 .include	"${.CURDIR}/Makefile.features"
 post-patch:
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' \
 		-e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		-e "s|\`-O'|\`${CFLAGS}'|g" \
 		${WRKSRC}/devtools/OS/FreeBSD
 	@${SED} ${SITE_SUB} -e '\|^dnl |d' -e '/^dnl$$/d' \
 		${SITE} > ${WCONF}/site.config.m4
 
 pre-configure:
 .if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
 	${LN} -s ${LIBDK_PATH}/libdk ${WRKSRC}/
 	${CP} ${LIBDK_PATH}/rfc4870.txt ${WRKSRC}/
 .endif
 
 post-install:
 .if !defined(WITH_DEBUG)
 	@${STRIP_CMD} ${PREFIX}/libexec/dkim-filter
 .endif
 	@${MKDIR} ${PREFIX}/etc/mail
 	${INSTALL_DATA} ${WRKSRC}/dkim-filter/dkim-filter.conf.sample ${PREFIX}/etc/mail/
 .for i in ${MAN5}
 	@${RM} -f ${MANPREFIX}/man/cat5/${i} ${MANPREFIX}/man/cat5/${i}.gz
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man5/
 .endfor
 .for i in ${MAN8}
 	@${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8/
 .endfor
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/dkim-filter/README ${DOCSDIR}/README.dkim-filter
 	${INSTALL_DATA} ${WRKSRC}/libdkim/README ${DOCSDIR}/README.libdkim
 	${MKDIR} ${DOCSDIR}/libdkim
 .for f in ${LIBDOCS}
 	${INSTALL_DATA} ${WRKSRC}/libdkim/docs/`${BASENAME} ${f}` ${DOCSDIR}/libdkim/
 .endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo
index 9231c3a72a25..c681800d81f5 100644
--- a/mail/dkim-milter/distinfo
+++ b/mail/dkim-milter/distinfo
@@ -1,3 +1,3 @@
-MD5 (dkim-milter-2.5.3.tar.gz) = 048f6b592cfbd89ee9faa52253e14bf2
-SHA256 (dkim-milter-2.5.3.tar.gz) = eab9184b68190a17998e7a5b2cb4e630b937977cf142b138792d28e9511fc0d5
-SIZE (dkim-milter-2.5.3.tar.gz) = 644106
+MD5 (dkim-milter-2.5.5.tar.gz) = 8e2be29e0edb198642523880821b3166
+SHA256 (dkim-milter-2.5.5.tar.gz) = 683b9924225e30ec4add5eb3229552fd8f5e3b94f5bace50429f66f2235424fe
+SIZE (dkim-milter-2.5.5.tar.gz) = 646196
diff --git a/mail/dkim-milter/files/milter-dkim.sh.in b/mail/dkim-milter/files/milter-dkim.sh.in
index 487cbba04ebb..dc43908dbc50 100644
--- a/mail/dkim-milter/files/milter-dkim.sh.in
+++ b/mail/dkim-milter/files/milter-dkim.sh.in
@@ -1,162 +1,162 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: milter-dkim
 # REQUIRE: DAEMON
 # BEFORE: mail
 # KEYWORD: shutdown
 
 # Define these milterdkim_* variables in one of these files:
 #	/etc/rc.conf
 #	/etc/rc.conf.local
 #	/etc/rc.conf.d/milterdkim
 #
 # milterdkim_enable (bool):   Set to "NO" by default.
 #                             Set it to "YES" to enable dkim-milter
 # milterdkim_uid (str):       Set username to run milter.
 # milterdkim_profiles (list): Set to "" by default.
 #                             Define your profiles here.
 # milterdkim_socket (str):    Path to the milter socket.
 # milterdkim_cfgfile (str):   Configuration file. Also see dkim-filter.conf(5)
 # milterdkim_domain (str):    Domainpart of From: in mails to sign.
 # milterdkim_key (str):       Path to the private key file to sign with.
 # milterdkim_selector (str):  Selector to use when signing
 # milterdkim_alg (str):       Algorithm to use when signing
 # milterdkim_flags (str):     Flags passed to start command.
 #
 # milterdkim_${profile}_* :   Variables per profile.
 #                             Sockets must be different from each other.
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
 milterdkim_enable=${milterdkim_enable:-"NO"}
 milterdkim_uid=${milterdkim_uid:-"mailnull"}
 milterdkim_profiles=${milterdkim_profiles:-}
 milterdkim_socket=${milterdkim_socket:-"local:/var/run/milterdkim/filter"}
 milterdkim_cfgfile=${milterdkim_cfgfile:-"%%PREFIX%%/etc/mail/dkim-filter.conf"}
-milterdkim_domain=${milterdkim_domain:-"example.com"}
+milterdkim_domain=${milterdkim_domain:-}
 milterdkim_key=${milterdkim_key:-}
 milterdkim_selector=${milterdkim_selector:-}
 milterdkim_alg=${milterdkim_alg:-}
 # Options other than above can be set with $milterdkim_flags.
 # see dkim-milter documentation for detail.
-milterdkim_flags=${milterdkim_flags:-"-b sv -c simple/simple -m MSA"}
+milterdkim_flags=${milterdkim_flags:-}
 
 . %%RC_SUBR%%
 
 name="milterdkim"
 rcvar=`set_rcvar`
 
 start_precmd="dkim_prepcmd"
 stop_postcmd="dkim_postcmd"
 command="%%PREFIX%%/libexec/dkim-filter"
 _piddir="/var/run/milterdkim"
 pidfile="${_piddir}/pid"
 
 load_rc_config $name
 
 if [ -n "$2" ]; then
     profile="$2"
     if [ "x${milterdkim_profiles}" != "x" ]; then
 	pidfile="${_piddir}/${profile}.pid"
 	eval milterdkim_enable="\${milterdkim_${profile}_enable:-${milterdkim_enable}}"
 	eval milterdkim_socket="\${milterdkim_${profile}_socket:-}"
 	if [ "x${milterdkim_socket}" = "x" ];then
 	    echo "You must define a socket (milterdkim_${profile}_socket)"
 	    exit 1
 	fi
 	eval milterdkim_cfgfile="\${milterdkim_${profile}_cfgfile:-${milterdkim_cfgfile}}"
 	eval milterdkim_domain="\${milterdkim_${profile}_domain:-${milterdkim_domain}}"
 	eval milterdkim_key="\${milterdkim_${profile}_key:-${milterdkim_key}}"
 	eval milterdkim_selector="\${milterdkim_${profile}_selector:-${milterdkim_selector}}"
 	eval milterdkim_alg="\${milterdkim_${profile}_alg:-${milterdkim_alg}}"
 	eval milterdkim_flags="\${milterdkim_${profile}_flags:-${milterdkim_flags}}"
 	if [ -f "${milterdkim_cfgfile}" ];then
 	    milterdkim_cfgfile="-x ${milterdkim_cfgfile}"
 	else
 	    milterdkim_cfgfile=""
 	fi
 	if [ "x${milterdkim_domain}" != "x" ];then
 	    milterdkim_domain="-d ${milterdkim_domain}"
 	fi
 	if [ "x${milterdkim_key}" != "x" ];then
 	    milterdkim_key="-k ${milterdkim_key}"
 	fi
 	if [ "x${milterdkim_selector}" != "x" ];then
 	    milterdkim_selector="-s ${milterdkim_selector}"
 	fi
 	if [ "x${milterdkim_alg}" != "x" ];then
 	    milterdkim_alg="-S ${milterdkim_alg}"
 	fi
 	command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
     else
 	echo "$0: extra argument ignored"
     fi
 else
     if [ "x${milterdkim_profiles}" != "x" -a "x$1" != "x" ]; then
 	if [ "x$1" != "xrestart" ]; then
 	    for profile in ${milterdkim_profiles}; do
 		echo "===> milterdkim profile: ${profile}"
 		%%RC_SCRIPT%% $1 ${profile}
 		retcode="$?"
 		if [ "0${retcode}" -ne 0 ]; then
 		    failed="${profile} (${retcode}) ${failed:-}"
 		else
 		    success="${profile} ${success:-}"
 		fi
 	    done
 	    exit 0
 	else
 	    restart_precmd=""
 	fi
     else
 	if [ -f "${milterdkim_cfgfile}" ];then
 	    milterdkim_cfgfile="-x ${milterdkim_cfgfile}"
 	else
 	    milterdkim_cfgfile=""
 	fi
 	if [ "x${milterdkim_domain}" != "x" ];then
 	    milterdkim_domain="-d ${milterdkim_domain}"
 	fi
 	if [ "x${milterdkim_key}" != "x" ];then
 	    milterdkim_key="-k ${milterdkim_key}"
 	fi
 	if [ "x${milterdkim_selector}" != "x" ];then
 	    milterdkim_selector="-s ${milterdkim_selector}"
 	fi
 	if [ "x${milterdkim_alg}" != "x" ];then
 	    milterdkim_alg="-S ${milterdkim_alg}"
 	fi
 	command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
     fi
 fi
 
 dkim_prepcmd ()
 {
     if [ -S ${milterdkim_socket##local:} ] ; then
         rm -f ${milterdkim_socket##local:}
     elif [ -S ${milterdkim_socket##unix:} ] ; then
         rm -f ${milterdkim_socket##unix:}
     fi
     if [ ! -d ${_piddir} ] ; then
 	mkdir -p ${_piddir}
     fi
     if [ -n "${milterdkim_uid}" ] ; then
 	chown ${milterdkim_uid} ${_piddir}
     fi
 }
 
 dkim_postcmd()
 {
     if [ -S ${milterdkim_socket##local:} ] ; then
         rm -f ${milterdkim_socket##local:}
     elif [ -S ${milterdkim_socket##unix:} ] ; then
         rm -f ${milterdkim_socket##unix:}
     fi
     # just if the directory is empty
     rmdir ${_piddir} > /dev/null 2>&1
 }
 
 run_rc_command "$1"