[dovecot-cvs] dovecot configure.in, 1.166, 1.167 dovecot-example.conf, 1.90, 1.91

[cras at procontrol.fi]

Update of /home/cvs/dovecot
In directory talvi:/tmp/cvs-serv23527

Modified Files:
	configure.in dovecot-example.conf 
Log Message:
Separate mbox_locks/mbox_read_dotlock to mbox_read_locks and
mbox_write_locks. Added support for lockf() method.



Index: configure.in
===================================================================
RCS file: /home/cvs/dovecot/configure.in,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- a/configure.in	30 May 2004 01:39:58 -0000	1.166
+++ b/configure.in	3 Jun 2004 15:01:27 -0000	1.167
@@ -251,7 +251,7 @@
 fi
 
 dnl * after -lsocket and -lnsl tests, inet_aton() may be in them
-AC_CHECK_FUNCS(fcntl flock inet_aton sigaction getpagesize madvise \
+AC_CHECK_FUNCS(fcntl flock lockf inet_aton sigaction getpagesize madvise \
                strcasecmp stricmp vsnprintf vsyslog writev pread \
 	       setrlimit setproctitle)
 

Index: dovecot-example.conf
===================================================================
RCS file: /home/cvs/dovecot/dovecot-example.conf,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- a/dovecot-example.conf	31 May 2004 18:04:46 -0000	1.90
+++ b/dovecot-example.conf	3 Jun 2004 15:01:27 -0000	1.91
@@ -283,24 +283,21 @@
 # specifies that existing messages are immutable.
 #maildir_check_content_changes = no
 
-# Which locking methods to use for locking mbox. There's three available:
+# Which locking methods to use for locking mbox. There's four available:
 #  dotlock: Create <mailbox>.lock file. This is the oldest and most NFS-safe
 #           solution. If you want to use /var/mail/ like directory, the users
 #           will need write access to that directory.
 #  fcntl  : Use this if possible. Works with NFS too if lockd is used.
 #  flock  : May not exist in all systems. Doesn't work with NFS.
+#  lockf  : May not exist in all systems. Doesn't work with NFS.
 #
-# You can use both fcntl and flock too; if you do the order they're declared
-# with is important to avoid deadlocks if other MTAs/MUAs are using both fcntl
-# and flock. Some operating systems don't allow using both of them
-# simultaneously, eg. BSDs. If dotlock is used, it's always created first.
-#mbox_locks = dotlock fcntl
-
-# Should we create dotlock file even when we want only a read-lock? Setting
-# this to yes hurts the performance when the mailbox is accessed simultaneously
-# by multiple processes, but it's needed for reliable reading if no other
-# locking methods are available.
-#mbox_read_dotlock = no
+# You can use multiple locking methods; if you do the order they're declared
+# in is important to avoid deadlocks if other MTAs/MUAs are using multiple
+# locking methods as well. Some operating systems don't allow using some of
+# them simultaneously. If dotlocking is used, it must always be first in the
+# list.
+#mbox_read_locks = fcntl
+#mbox_write_locks = dotlock fcntl
 
 # Maximum time in seconds to wait for lock (all of them) before aborting.
 #mbox_lock_timeout = 300