$NetBSD: patch-aj,v 1.5 2008/02/19 18:45:24 jlam Exp $

--- courier/perms.sh.in.orig	2007-07-01 11:36:31.000000000 -0400
+++ courier/perms.sh.in
@@ -11,119 +11,41 @@ exec_prefix="@exec_prefix@"
 datarootdir="@datarootdir@"
 
 PERMS="
-.			755
-
-@localstatedir@		755	x	bin	bin
-@localstatedir@/tmp	770
-@localstatedir@/msgs	750
-@localstatedir@/msgq	750
-@localstatedir@/track	755
-
-@sysconfdir@		755	x
-@sysconfdir@/aliasdir	755
-@sysconfdir@/aliases	750
-@sysconfdir@/enablefiltering	644	config
-@sysconfdir@/maildrop	644	config
-@sysconfdir@/smtpaccess	755
-@sysconfdir@/shared	755
-@sysconfdir@/shared.tmp	755
-@sysconfdir@/smtpaccess/default	644	config
-@sysconfdir@/courierd.dist	644	config
-@sysconfdir@/aliases/system	640	config
-@sysconfdir@/pop3d.dist	644	config
-@sysconfdir@/pop3d-ssl.dist	644	config
-@sysconfdir@/pop3d.authpam	644	config
-@sysconfdir@/pop3d.cnf		600	config
-@sysconfdir@/imapd.dist	644	config
-@sysconfdir@/imapd-ssl.dist	644	config
-@sysconfdir@/imapd.authpam	644	config
-@sysconfdir@/imapd.cnf		600	config
-@sysconfdir@/sqwebmaild.dist	644	config
-@sysconfdir@/webmail.authpam	644	config
-@sysconfdir@/webmlmrc.dist	644	config
-@sysconfdir@/quotawarnmsg.example	444
-@sysconfdir@/rfcerrheader.txt	444	config
-@sysconfdir@/rfcerr2045.txt	444	config
-@sysconfdir@/rfcerr2046.txt	444	config
-@sysconfdir@/rfcerr2047.txt	444	config
-
-@libexecdir@		755	x	bin	bin
 @libexecdir@/courier	755	x	bin	bin
 @libexecdir@/courier/modules	755	x	bin	bin
 @libexecdir@/courier/submitmkdir	4550
 @libexecdir@/courier/courierd	550
-@libexecdir@/courier/courierpop3d	555
-@libexecdir@/courier/courierpop3login	555
 @libexecdir@/courier/aliasexp		550
 @libexecdir@/courier/aliascombine	550
 @libexecdir@/courier/aliascreate	550
 @libexecdir@/courier/submit		550
-@libexecdir@/courier/makedatprog	555
-@libexecdir@/courier/imaplogin		555	x	bin	bin
-@libexecdir@/courier/pcpd		555	x	bin	bin
-@libexecdir@/courier/webmail		700	x	root	bin
-@libexecdir@/courier/webmail/webmail	555	x	root	bin
 @libexecdir@/courier/webmail/webmlm	555	x	root	bin
-@libexecdir@/courier/sqwebmaild		555
-@libexecdir@/courier/sqwebpasswd	2755
 @libexecdir@/courier/webmail/webadmin	4555	x	root	bin
 
-@sbindir@			755	x	bin	bin
 @sbindir@/courier		555
 @sbindir@/showconfig		555
 @sbindir@/showmodules		550
-@sbindir@/couriertcpd		555
-@sbindir@/imapd			555
-@sbindir@/imapd-ssl		555
-@sbindir@/sharedindexsplit	555
-@sbindir@/sharedindexinstall	555
 @sbindir@/aliaslookup		555
-@sbindir@/webmaild		555
-@datadir@/imapd			555	x	bin	bin
-@datadir@/imapd-ssl		555	x	bin	bin
 
-@bindir@			755	x	bin	bin
 @bindir@/cancelmsg		6555
 @bindir@/courier-config		555
 @bindir@/mailq			2555
-@bindir@/maildirmake		555
-@bindir@/maildiracl		555
-@bindir@/maildirkw		555
 @bindir@/sendmail		4511	x	root
 @bindir@/rmail			4511	x	root
-@bindir@/lockmail		555
-@bindir@/deliverquota		555
-@bindir@/mailbot		555
-@bindir@/makemime		555
-@bindir@/reformail		555
-@bindir@/reformime		555
-@bindir@/mimegpg		555
 @bindir@/couriermlm		555
 @bindir@/dotforward		555
 @bindir@/webmlmd		555
 @bindir@/webmlmd.rc		555
 
-@datadir@/makedat		555	x	bin	bin
-@bindir@/makedat		555
 @bindir@/testmxlookup		555
-@bindir@/imapd			555
 @datadir@/makealiases		550
 @sbindir@/makealiases		550
 @datadir@/makehosteddomains	555
 @sbindir@/makehosteddomains	555
-@datadir@/pop3d			755
-@sbindir@/pop3d			755
-@datadir@/pop3d-ssl		755
-@sbindir@/pop3d-ssl		755
-@sbindir@/webgpg		555
 
 @datadir@			755	x	bin	bin
 @datadir@/courierctl.start	555
 
-@datadir@/mkimapdcert		755
-@sbindir@/mkimapdcert		755
-@datadir@/mkpop3dcert		755
-@sbindir@/mkpop3dcert		755
 @datadir@/couriermlm		755
 
 @datadir@/couriermlm/adminrequest.tmpl	644
@@ -191,11 +113,20 @@ do
 	if test "$USER" = ""
 	then
 		USER="@mailuser@"
+	elif test "$USER" = "root"
+	then
+		USER="@REAL_ROOT_USER@"
+	elif test "$USER" = "bin"
+	then
+		USER="@ROOT_USER@"
 	fi
 
 	if test "$GROUP" = ""
 	then
 		GROUP="@mailgroup@"
+	elif test "$GROUP" = "bin"
+	then
+		GROUP="@ROOT_GROUP@"
 	fi
 
 	case $FILE in
@@ -216,26 +147,7 @@ do
 	echo $FILE $MODE $USER $GROUP $SPECIAL
 done
 
-. ../tcpd/couriertls.config
-
-if test "$couriertls" != ""
-then
-   echo @bindir@/couriertls 555 bin bin
-fi
-
 if test "@HAVE_LDAP@" != 0
 then
-	echo @sysconfdir@/ldapaliasrc.dist 640 @mailuser@ @mailgroup@ config
 	echo @sbindir@/courierldapaliasd 700 @mailuser@ @mailgroup@
 fi
-
-echo @datadir@/sqwebmail/images 755 @mailuser@ @mailgroup@
-
-for f in `cat ../webmail/images/filelist 2>/dev/null`
-do
-	echo @datadir@/sqwebmail/images/$f 444 @mailuser@ @mailgroup@
-done
-
-. ../maildrop/uidgid
-
-echo @bindir@/maildrop 4511 $uid @mailgroup@
