dovecot-2.0: master: unix_listener settings can now have the pat...
dovecot at dovecot.org
dovecot at dovecot.org
Sat Oct 24 00:30:24 EEST 2009
details: http://hg.dovecot.org/dovecot-2.0/rev/f7943875e069
changeset: 10173:f7943875e069
user: Timo Sirainen <tss at iki.fi>
date: Fri Oct 23 17:30:18 2009 -0400
description:
master: unix_listener settings can now have the path in the block name.
diffstat:
2 files changed, 13 insertions(+), 26 deletions(-)
doc/example-config/conf.d/master.conf | 37 ++++++++++-----------------------
src/master/master-settings.c | 2 -
diffs (125 lines):
diff -r a768005d1549 -r f7943875e069 doc/example-config/conf.d/master.conf
--- a/doc/example-config/conf.d/master.conf Fri Oct 23 16:23:35 2009 -0400
+++ b/doc/example-config/conf.d/master.conf Fri Oct 23 17:30:18 2009 -0400
@@ -6,8 +6,7 @@ service config {
type = config
executable = config
- unix_listener {
- path = config
+ unix_listener config {
mode = 0666
}
}
@@ -26,34 +25,28 @@ service anvil {
user = dovecot
chroot = empty/
- unix_listener {
- path = anvil
+ unix_listener anvil {
}
}
service auth {
executable = auth
- # default
- unix_listener {
- path = login/auth
+ unix_listener login/auth {
mode = 0666
}
# Postfix smtp-auth
- #unix_listener {
- # path = /var/spool/postfix/private/auth
+ #unix_listener /var/spool/postfix/private/auth {
# mode = 0666
#}
# Dovecot LDA
- unix_listener {
- path = auth-userdb
+ unix_listener auth-userdb {
mode = 0600
}
- unix_listener {
- path = auth-master
+ unix_listener auth-master {
mode = 0600
}
@@ -64,8 +57,7 @@ service auth-worker {
executable = auth -w
client_limit = 1
- unix_listener {
- path = auth-worker
+ unix_listener auth-worker {
}
}
@@ -111,8 +103,7 @@ service imap {
#vsz_limit = 256
service_count = 1
- unix_listener {
- path = login/imap
+ unix_listener login/imap {
mode = 0666
}
}
@@ -142,8 +133,7 @@ service pop3 {
executable = pop3
service_count = 1
- unix_listener {
- path = login/pop3
+ unix_listener login/pop3 {
mode = 0666
}
}
@@ -152,8 +142,7 @@ service lmtp {
protocol = lmtp
executable = lmtp
- unix_listener {
- path = lmtp
+ unix_listener lmtp {
mode = 0666
}
}
@@ -161,8 +150,7 @@ service dict {
service dict {
executable = dict
- unix_listener {
- path = dict
+ unix_listener dict {
mode = 0666
}
}
@@ -170,8 +158,7 @@ service ssl-params {
service ssl-params {
executable = ssl-params
- unix_listener {
- path = login/ssl-params
+ unix_listener login/ssl-params {
mode = 0666
}
}
diff -r a768005d1549 -r f7943875e069 src/master/master-settings.c
--- a/src/master/master-settings.c Fri Oct 23 16:23:35 2009 -0400
+++ b/src/master/master-settings.c Fri Oct 23 17:30:18 2009 -0400
@@ -47,7 +47,7 @@ static struct setting_parser_info file_l
MEMBER(defines) file_listener_setting_defines,
MEMBER(defaults) &file_listener_default_settings,
- MEMBER(type_offset) (size_t)-1,
+ MEMBER(type_offset) offsetof(struct file_listener_settings, path),
MEMBER(struct_size) sizeof(struct file_listener_settings),
MEMBER(parent_offset) (size_t)-1,
More information about the dovecot-cvs
mailing list