master: unix_listener settings can now have the path in the block name.

--HG--
branch : HEAD

diff --git a/doc/example-config/conf.d/master.conf b/doc/example-config/conf.d/master.conf
index d9dcc5b18e16b43f08406e56a30aa42a628328f4..8efef3036d65d210f0bf1993845c648315f096df 100644 (file)
--- a/doc/example-config/conf.d/master.conf
+++ b/doc/example-config/conf.d/master.conf
@@ -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 lmtp {
 service dict {
   executable = dict
 
-  unix_listener {
-    path = dict
+  unix_listener dict {
     mode = 0666
   }
 }
@@ -170,8 +158,7 @@ service dict {
 service ssl-params {
   executable = ssl-params
 
-  unix_listener {
-    path = login/ssl-params
+  unix_listener login/ssl-params {
     mode = 0666
   }
 }

diff --git a/src/master/master-settings.c b/src/master/master-settings.c
index fa7388f578e532504bfb063b0c2f97d259697bfa..674df8651184e4179170f5bfd22f374d35755bfa 100644 (file)
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -47,7 +47,7 @@ static struct setting_parser_info file_listener_setting_parser_info = {
        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,