diff options
| author | Wesley Shields <wxs@FreeBSD.org> | 2009-01-19 20:50:23 +0000 |
|---|---|---|
| committer | Wesley Shields <wxs@FreeBSD.org> | 2009-01-19 20:50:23 +0000 |
| commit | e818ea0ce8aed0f9fda7b154abc46b7e6d16a814 (patch) | |
| tree | 9e6be9161e93ef36791baf8d523d04b6f073b62a /mail/dkim-milter/files/milter-dkim.sh.in | |
| parent | 02618f7fa0a24729f6bbb9bd93709b46b0362bb5 (diff) | |
Notes
Diffstat (limited to 'mail/dkim-milter/files/milter-dkim.sh.in')
| -rw-r--r-- | mail/dkim-milter/files/milter-dkim.sh.in | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/mail/dkim-milter/files/milter-dkim.sh.in b/mail/dkim-milter/files/milter-dkim.sh.in index aa24feb301b1..9435e73e92c1 100644 --- a/mail/dkim-milter/files/milter-dkim.sh.in +++ b/mail/dkim-milter/files/milter-dkim.sh.in @@ -30,22 +30,6 @@ # milterdkim_selector (str): Selector to use when signing # milterdkim_alg (str): Algorithm to use when signing # milterdkim_flags (str): Flags passed to start command. -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# -milterdkim_enable=${milterdkim_enable:-"NO"} -milterdkim_uid=${milterdkim_uid:-"mailnull"} -milterdkim_profiles=${milterdkim_profiles:-} -milterdkim_cfgfile=${milterdkim_cfgfile:-"%%PREFIX%%/etc/mail/dkim-filter.conf"} - -milterdkim_socket=${milterdkim_socket:-} -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:-} . %%RC_SUBR%% @@ -60,6 +44,23 @@ pidfile="${_piddir}/pid" load_rc_config $name +# +# DO NOT CHANGE THESE DEFAULT VALUES HERE +# +: ${milterdkim_enable="NO"} +: ${milterdkim_uid="mailnull"} +: ${milterdkim_profiles=""} +: ${milterdkim_cfgfile="%%PREFIX%%/etc/mail/dkim-filter.conf"} + +: ${milterdkim_socket=""} +: ${milterdkim_domain=""} +: ${milterdkim_key=""} +: ${milterdkim_selector=""} +: ${milterdkim_alg=""} +# Options other than above can be set with $milterdkim_flags. +# see dkim-milter documentation for detail. +:milterdkim_flags=${milterdkim_flags=""} + if [ -n "$2" ]; then profile="$2" if [ "x${milterdkim_profiles}" != "x" ]; then @@ -84,6 +85,9 @@ if [ -n "$2" ]; then if [ "x${milterdkim_socket}" != "x" ];then _socket_prefix="-p" fi + if [ "x${milterdkim_uid}" != "x" ];then + _uid_prefix="-u" + fi if [ "x${milterdkim_domain}" != "x" ];then milterdkim_domain="-d ${milterdkim_domain}" fi @@ -96,7 +100,7 @@ if [ -n "$2" ]; then if [ "x${milterdkim_alg}" != "x" ];then milterdkim_alg="-S ${milterdkim_alg}" fi - command_args="-l ${_socket_prefix} ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}" + command_args="-l ${_socket_prefix} ${milterdkim_socket} ${_uid_prefix} ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}" else echo "$0: extra argument ignored" fi @@ -126,6 +130,9 @@ else if [ "x${milterdkim_socket}" != "x" ];then _socket_prefix="-p" fi + if [ "x${milterdkim_uid}" != "x" ];then + _uid_prefix="-u" + fi if [ "x${milterdkim_domain}" != "x" ];then milterdkim_domain="-d ${milterdkim_domain}" fi @@ -138,7 +145,7 @@ else if [ "x${milterdkim_alg}" != "x" ];then milterdkim_alg="-S ${milterdkim_alg}" fi - command_args="-l ${_socket_prefix} ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}" + command_args="-l ${_socket_prefix} ${milterdkim_socket} ${_uid_prefix} ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}" fi fi |