Use "mailnull" user as default

Always chown piddir

Submitted by:   Hirohisa Yamaguchi <umq@ueo.co.jp>

2 files changed, 3 insertions, 22 deletions

diff --git a/mail/dkim-milter/files/milter-dkim.sh.in b/mail/dkim-milter/files/milter-dkim.sh.in
index ba2f35254023..f761c28694fb 100644
--- a/mail/dkim-milter/files/milter-dkim.sh.in
+++ b/mail/dkim-milter/files/milter-dkim.sh.in
@@ -31,7 +31,7 @@
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
 milterdkim_enable=${milterdkim_enable:-"NO"}
-milterdkim_uid=${milterdkim_uid:-"dkimfilter"}
+milterdkim_uid=${milterdkim_uid:-"mailnull"}
 milterdkim_profiles=${milterdkim_profiles:-}
 milterdkim_socket=${milterdkim_socket:-"local:/var/run/milterdkim/filter"}
 milterdkim_domain=${milterdkim_domain:-"example.com"}
@@ -101,10 +101,9 @@ dkim_prepcmd ()
     elif [ -S ${milterdkim_socket##unix:} ] ; then
         rm -f ${milterdkim_socket##unix:}
     fi
-    if [ -d ${_piddir} ] ; then
-	return;
+    if [ ! -d ${_piddir} ] ; then
+	mkdir -p ${_piddir}
     fi
-    mkdir -p ${_piddir}
     if [ -n "${milterdkim_uid}" ] ; then
 	chown ${milterdkim_uid} ${_piddir}
     fi
diff --git a/mail/dkim-milter/pkg-install b/mail/dkim-milter/pkg-install
deleted file mode 100644
index 763eedcadc1c..000000000000
--- a/mail/dkim-milter/pkg-install
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "POST-INSTALL" ]
-then
-	exit 0;
-fi
-
-# check if dkimfilter user exists
-pw user show dkimfilter > /dev/null 2>&1
-
-if [ $? != 0 ]
-then
-	echo "===>  Adding user dkimfilter"
-	pw useradd dkimfilter -c "milter-dkim" -s /sbin/nologin \
-	-d /nonexistent
-else
-	echo "===>  Using existing user dkimfilter" 
-fi