[dovecot-cvs] dovecot/src/master mail-process.c, 1.96.2.24, 1.96.2.25 master-settings-defs.c, 1.1.2.6, 1.1.2.7 master-settings.c, 1.125.2.30, 1.125.2.31 master-settings.h, 1.83.2.12, 1.83.2.13

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/master
In directory talvi:/tmp/cvs-serv28610/src/master

Modified Files:
      Tag: branch_1_0
	mail-process.c master-settings-defs.c master-settings.c 
	master-settings.h 
Log Message:
Reversed the last change. It wasn't supposed to go to branch_1_0.



Index: mail-process.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/mail-process.c,v
retrieving revision 1.96.2.24
retrieving revision 1.96.2.25
diff -u -d -r1.96.2.24 -r1.96.2.25
--- mail-process.c	16 May 2007 15:14:17 -0000	1.96.2.24
+++ mail-process.c	16 May 2007 15:22:34 -0000	1.96.2.25
@@ -237,6 +237,8 @@
 		env_put("MAIL_READ_MMAPED=1");
 	if (set->mmap_disable)
 		env_put("MMAP_DISABLE=1");
+	if (set->mmap_no_write)
+		env_put("MMAP_NO_WRITE=1");
 	if (set->dotlock_use_excl)
 		env_put("DOTLOCK_USE_EXCL=1");
 	if (set->fsync_disable)

Index: master-settings-defs.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings-defs.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- master-settings-defs.c	16 May 2007 15:14:17 -0000	1.1.2.6
+++ master-settings-defs.c	16 May 2007 15:22:34 -0000	1.1.2.7
@@ -71,6 +71,7 @@
 	DEF(SET_BOOL, mail_save_crlf),
 	DEF(SET_BOOL, mail_read_mmaped),
 	DEF(SET_BOOL, mmap_disable),
+	DEF(SET_BOOL, mmap_no_write),
 	DEF(SET_BOOL, dotlock_use_excl),
 	DEF(SET_BOOL, fsync_disable),
 	DEF(SET_STR, lock_method),

Index: master-settings.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.125.2.30
retrieving revision 1.125.2.31
diff -u -d -r1.125.2.30 -r1.125.2.31
--- master-settings.c	16 May 2007 15:14:17 -0000	1.125.2.30
+++ master-settings.c	16 May 2007 15:22:34 -0000	1.125.2.31
@@ -218,10 +218,11 @@
 	MEMBER(mail_max_keyword_length) 50,
 	MEMBER(mail_save_crlf) FALSE,
 	MEMBER(mail_read_mmaped) FALSE,
+	MEMBER(mmap_disable) FALSE,
 #ifdef MMAP_CONFLICTS_WRITE
-	MEMBER(mmap_disable) TRUE,
+	MEMBER(mmap_no_write) TRUE,
 #else
-	MEMBER(mmap_disable) FALSE,
+	MEMBER(mmap_no_write) FALSE,
 #endif
 	MEMBER(dotlock_use_excl) FALSE,
 	MEMBER(fsync_disable) FALSE,

Index: master-settings.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.h,v
retrieving revision 1.83.2.12
retrieving revision 1.83.2.13
diff -u -d -r1.83.2.12 -r1.83.2.13
--- master-settings.h	16 May 2007 15:14:17 -0000	1.83.2.12
+++ master-settings.h	16 May 2007 15:22:34 -0000	1.83.2.13
@@ -79,6 +79,7 @@
 	bool mail_save_crlf;
 	bool mail_read_mmaped;
 	bool mmap_disable;
+	bool mmap_no_write;
 	bool dotlock_use_excl;
 	bool fsync_disable;
 	const char *lock_method;