Lines 37-45
milterdkim_socket=${milterdkim_socket:-"
Link Here
|
37 |
milterdkim_domain=${milterdkim_domain:-"example.com"} |
37 |
milterdkim_domain=${milterdkim_domain:-"example.com"} |
38 |
milterdkim_key=${milterdkim_key:-"/var/db/domainkeys/default.key.pem"} |
38 |
milterdkim_key=${milterdkim_key:-"/var/db/domainkeys/default.key.pem"} |
39 |
milterdkim_selector=${milterdkim_selector:-"default"} |
39 |
milterdkim_selector=${milterdkim_selector:-"default"} |
40 |
milterdkim_alg=${milterdkim_alg:-"rsa-sha1"} |
40 |
milterdkim_alg=${milterdkim_alg:-} |
41 |
## milterdkim_flags expands escaped variables later. |
41 |
# Options other than above can be set with $milterdkim_flags. |
42 |
milterdkim_flags=${milterdkim_flags:-'-d ${milterdkim_domain} -c simple -m MSA -s ${milterdkim_selector} -k ${milterdkim_key} -S ${milterdkim_alg}'} |
42 |
# see dkim-milter documentation for detail. |
|
|
43 |
milterdkim_flags=${milterdkim_flags:-"-b sv -c simple/simple -m MSA"} |
43 |
|
44 |
|
44 |
. %%RC_SUBR%% |
45 |
. %%RC_SUBR%% |
45 |
|
46 |
|
Lines 66-73
if [ -n "$2" ]; then
Link Here
|
66 |
fi |
67 |
fi |
67 |
eval milterdkim_domain="\${milterdkim_${profile}_domain:-${milterdkim_domain}}" |
68 |
eval milterdkim_domain="\${milterdkim_${profile}_domain:-${milterdkim_domain}}" |
68 |
eval milterdkim_key="\${milterdkim_${profile}_key:-${milterdkim_key}}" |
69 |
eval milterdkim_key="\${milterdkim_${profile}_key:-${milterdkim_key}}" |
|
|
70 |
eval milterdkim_selector="\${milterdkim_${profile}_selector:-${milterdkim_selector}}" |
71 |
eval milterdkim_alg="\${milterdkim_${profile}_alg:-${milterdkim_alg}}" |
69 |
eval milterdkim_flags="\${milterdkim_${profile}_flags:-${milterdkim_flags}}" |
72 |
eval milterdkim_flags="\${milterdkim_${profile}_flags:-${milterdkim_flags}}" |
70 |
command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} -d ${milterdkim_domain} -k ${milterdkim_key} -s ${milterdkim_selector} -S ${milterdkim_alg}" |
73 |
if [ "x${milterdkim_domain}" != "x" ];then |
|
|
74 |
milterdkim_domain="-d ${milterdkim_domain}" |
75 |
fi |
76 |
if [ "x${milterdkim_key}" != "x" ];then |
77 |
milterdkim_key="-k ${milterdkim_key}" |
78 |
fi |
79 |
if [ "x${milterdkim_selector}" != "x" ];then |
80 |
milterdkim_selector="-s ${milterdkim_selector}" |
81 |
fi |
82 |
if [ "x${milterdkim_alg}" != "x" ];then |
83 |
milterdkim_alg="-S ${milterdkim_alg}" |
84 |
fi |
85 |
command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}" |
71 |
else |
86 |
else |
72 |
echo "$0: extra argument ignored" |
87 |
echo "$0: extra argument ignored" |
73 |
fi |
88 |
fi |
Lines 89-96
else
Link Here
|
89 |
restart_precmd="" |
104 |
restart_precmd="" |
90 |
fi |
105 |
fi |
91 |
else |
106 |
else |
92 |
milterdkim_flags=${milterdkim_flags} |
107 |
if [ "x${milterdkim_domain}" != "x" ];then |
93 |
command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} -d ${milterdkim_domain} -k ${milterdkim_key} -s ${milterdkim_selector} -S ${milterdkim_alg}" |
108 |
milterdkim_domain="-d ${milterdkim_domain}" |
|
|
109 |
fi |
110 |
if [ "x${milterdkim_key}" != "x" ];then |
111 |
milterdkim_key="-k ${milterdkim_key}" |
112 |
fi |
113 |
if [ "x${milterdkim_selector}" != "x" ];then |
114 |
milterdkim_selector="-s ${milterdkim_selector}" |
115 |
fi |
116 |
if [ "x${milterdkim_alg}" != "x" ];then |
117 |
milterdkim_alg="-S ${milterdkim_alg}" |
118 |
fi |
119 |
command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}" |
94 |
fi |
120 |
fi |
95 |
fi |
121 |
fi |