diff -ruN cyrus-imapd-2.2.6.orig/master/conf/cmu-backend.conf cyrus-imapd-2.2.6/master/conf/cmu-backend.conf

--- cyrus-imapd-2.2.6.orig/master/conf/cmu-backend.conf	2003-10-23 03:03:10 +0900

+++ cyrus-imapd-2.2.6/master/conf/cmu-backend.conf	2004-06-19 12:04:42 +0900

@@ -8,18 +8,18 @@

   mupdatepush   cmd="ctl_mboxlist -m"

 }

-# UNIX sockets start with a slash and are put into /var/imap/sockets

+# UNIX sockets start with a slash and are put into /var/lib/imap/sockets

 SERVICES {

   # add or remove based on preferences

-  imap		cmd="imapd" listen="imap" prefork=5

-  imaps		cmd="imapd -s" listen="imaps" prefork=1

-  pop3		cmd="pop3d" listen="pop3" prefork=0

-  pop3s		cmd="pop3d -s" listen="pop3s" prefork=0

-  kpop          cmd="pop3d -k" listen="kpop" prefork=0

-  sieve		cmd="timsieved" listen="sieve" prefork=0

+#  imap		cmd="imapd" listen="imap" prefork=5

+#  imaps		cmd="imapd -s" listen="imaps" prefork=1

+#  pop3		cmd="pop3d" listen="pop3" prefork=0

+#  pop3s		cmd="pop3d -s" listen="pop3s" prefork=0

+#  kpop          cmd="pop3d -k" listen="kpop" prefork=0

+#  sieve		cmd="timsieved" listen="sieve" prefork=0

   # fud

-  fud		cmd="fud" listen="fud" prefork=1 proto="udp"

+#  fud		cmd="fud" listen="fud" prefork=1 proto="udp"

   notifyd	cmd="notifyd" listen="/imap/conf/socket/notifyd" proto="udp" prefork=1

   # at least one LMTP is required for delivery

diff -ruN cyrus-imapd-2.2.6.orig/master/conf/cmu-frontend.conf cyrus-imapd-2.2.6/master/conf/cmu-frontend.conf

--- cyrus-imapd-2.2.6.orig/master/conf/cmu-frontend.conf	2003-10-23 03:03:10 +0900

+++ cyrus-imapd-2.2.6/master/conf/cmu-frontend.conf	2004-06-19 12:04:42 +0900

@@ -4,21 +4,21 @@

   mboxlist	cmd="ctl_cyrusdb -r"

 }

-# UNIX sockets start with a slash and are put into /var/imap/sockets

+# UNIX sockets start with a slash and are put into /var/lib/imap/sockets

 SERVICES {

   # mupdate database service - must prefork atleast 1

   mupdate       cmd="/usr/cyrus/bin/mupdate" listen=2004 prefork=1

   # add or remove based on preferences

-  imap		cmd="proxyd" listen="imap" prefork=5

-  imaps         cmd="proxyd -s" listen="imaps" prefork=1

-  pop3		cmd="pop3d" listen="pop3" prefork=0

-  pop3s		cmd="pop3d -s" listen="pop3s" prefork=0

-  kpop          cmd="pop3d -k" listen="kpop" prefork=0

-  sieve         cmd="timsieved" listen="sieve" prefork=0

+#  imap		cmd="proxyd" listen="imap" prefork=5

+#  imaps         cmd="proxyd -s" listen="imaps" prefork=1

+#  pop3		cmd="pop3d" listen="pop3" prefork=0

+#  pop3s		cmd="pop3d -s" listen="pop3s" prefork=0

+#  kpop          cmd="pop3d -k" listen="kpop" prefork=0

+#  sieve         cmd="timsieved" listen="sieve" prefork=0

   # fud

-  fud           cmd="fud" listen="fud" prefork=1 proto="udp"

+#  fud           cmd="fud" listen="fud" prefork=1 proto="udp"

   # relay mail correctly

   lmtpunix	cmd="lmtpproxyd" listen="/imap/conf/socket/lmtpproxy" prefork=1

diff -ruN cyrus-imapd-2.2.6.orig/master/conf/normal.conf cyrus-imapd-2.2.6/master/conf/normal.conf

--- cyrus-imapd-2.2.6.orig/master/conf/normal.conf	2003-10-23 03:03:10 +0900

+++ cyrus-imapd-2.2.6/master/conf/normal.conf	2004-06-19 12:04:42 +0900

@@ -8,14 +8,14 @@

 #  idled		cmd="idled"

 }

-# UNIX sockets start with a slash and are put into /var/imap/socket

+# UNIX sockets start with a slash and are put into /var/lib/imap/socket

 SERVICES {

   # add or remove based on preferences

-  imap		cmd="imapd" listen="imap" prefork=0

-  imaps		cmd="imapd -s" listen="imaps" prefork=0

-  pop3		cmd="pop3d" listen="pop3" prefork=0

-  pop3s		cmd="pop3d -s" listen="pop3s" prefork=0

-  sieve		cmd="timsieved" listen="sieve" prefork=0

+#  imap		cmd="imapd" listen="imap" prefork=0

+#  imaps		cmd="imapd -s" listen="imaps" prefork=0

+#  pop3		cmd="pop3d" listen="pop3" prefork=0

+#  pop3s		cmd="pop3d -s" listen="pop3s" prefork=0

+#  sieve		cmd="timsieved" listen="sieve" prefork=0

   # these are only necessary if receiving/exporting usenet via NNTP

 #  nntp		cmd="nntpd" listen="nntp" prefork=0

@@ -23,10 +23,10 @@

   # at least one LMTP is required for delivery

 #  lmtp		cmd="lmtpd" listen="lmtp" prefork=0

-  lmtpunix	cmd="lmtpd" listen="/var/imap/socket/lmtp" prefork=0

+  lmtpunix	cmd="lmtpd" listen="/var/spool/postfix/public/lmtp" prefork=0

   # this is only necessary if using notifications

-#  notify	cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1

+#  notify	cmd="notifyd" listen="/var/lib/imap/socket/notify" proto="udp" prefork=1

 }

 EVENTS {

diff -ruN cyrus-imapd-2.2.6.orig/master/conf/prefork.conf cyrus-imapd-2.2.6/master/conf/prefork.conf

--- cyrus-imapd-2.2.6.orig/master/conf/prefork.conf	2003-10-23 03:03:10 +0900

+++ cyrus-imapd-2.2.6/master/conf/prefork.conf	2004-06-19 12:06:47 +0900

@@ -8,14 +8,15 @@

 #  idled		cmd="idled"

 }

-# UNIX sockets start with a slash and are put into /var/imap/sockets

+# UNIX sockets start with a slash and are put into /var/lib/imap/socket

 SERVICES {

   # add or remove based on preferences

-  imap		cmd="imapd" listen="imap" prefork=5

-  imaps		cmd="imapd -s" listen="imaps" prefork=1

-  pop3		cmd="pop3d" listen="pop3" prefork=3

-  pop3s		cmd="pop3d -s" listen="pop3s" prefork=1

-  sieve		cmd="timsieved" listen="sieve" prefork=0

+#  imap		cmd="imapd" listen="imap" prefork=5

+#  imaps		cmd="imapd -s" listen="imaps" prefork=1

+#  pop3		cmd="pop3d" listen="pop3" prefork=3

+#  pop3s		cmd="pop3d -s" listen="pop3s" prefork=1

+#  sieve		cmd="timsieved" listen="sieve" prefork=0

+#  smmapd		cmd="smmapd" listen="/var/lib/imap/socket/smmapd" prefork=1

   # these are only necessary if receiving/exporting usenet via NNTP

 #  nntp		cmd="nntpd" listen="nntp" prefork=3

@@ -23,10 +24,10 @@

   # at least one LMTP is required for delivery

 #  lmtp		cmd="lmtpd" listen="lmtp" prefork=0

-  lmtpunix	cmd="lmtpd" listen="/var/imap/socket/lmtp" prefork=1

+  lmtpunix	cmd="lmtpd" listen="/var/spool/postfix/public/lmtp" prefork=1

   # this is only necessary if using notifications

-#  notify	cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1

+#  notify	cmd="notifyd" listen="/var/lib/imap/socket/notify" proto="udp" prefork=1

 }

 EVENTS {

diff -ruN cyrus-imapd-2.2.6.orig/master/conf/small.conf cyrus-imapd-2.2.6/master/conf/small.conf

--- cyrus-imapd-2.2.6.orig/master/conf/small.conf	2002-10-02 05:46:01 +0900

+++ cyrus-imapd-2.2.6/master/conf/small.conf	2004-06-19 12:04:42 +0900

@@ -8,17 +8,17 @@

 #  idled		cmd="idled"

 }

-# UNIX sockets start with a slash and are put into /var/imap/sockets

+# UNIX sockets start with a slash and are put into /var/lib/imap/sockets

 SERVICES {

   # add or remove based on preferences

-  imap		cmd="imapd" listen="imap" prefork=0

-  pop3		cmd="pop3d" listen="pop3" prefork=0

+#  imap		cmd="imapd" listen="imap" prefork=0

+#  pop3		cmd="pop3d" listen="pop3" prefork=0

   # LMTP is required for delivery

-  lmtpunix	cmd="lmtpd" listen="/var/imap/socket/lmtp" prefork=0

+  lmtpunix	cmd="lmtpd" listen="/var/spool/postfix/public/lmtp" prefork=0

   # this is only necessary if using notifications

-#  notify	cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1

+#  notify	cmd="notifyd" listen="/var/lib/imap/socket/notify" proto="udp" prefork=1

 }

 EVENTS {