fix + augment fsl config, deliver program now logs as 'cyrdeliver'

imapd/fsl.imapd

@@ -2,7 +2,7 @@
 ##  fsl.imapd -- OSSP fsl configuration for cyrus imapd
 ##
 
-ident .*(imapd/.+) q{
+ident (imapd)/.+ q{
     prefix(
         prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
     ) 
@@ -14,7 +14,7 @@ ident .*(imapd/.+) q{
     }
 };
 
-ident .*(pop3d/.+) q{
+ident (pop3d)/.+ q{
     prefix(
         prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
     ) 
@@ -26,7 +26,7 @@ ident .*(pop3d/.+) q{
     }
 };
 
-ident .*(lmtpd/.+) q{
+ident (lmtpd)/.+ q{
     prefix(
         prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
     ) 
@@ -38,7 +38,43 @@ ident .*(lmtpd/.+) q{
     }
 };
 
-ident .*(master/.+) q{
+ident (idled)/.+ q{
+    prefix(
+        prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+    ) 
+    -> {
+        debug: file(
+            path="@l_prefix@/var/imapd/log/idled.log",
+            append=1, perm=0644
+        )
+    }
+};
+
+ident (notifyd)/.+ q{
+    prefix(
+        prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+    ) 
+    -> {
+        debug: file(
+            path="@l_prefix@/var/imapd/log/notifyd.log",
+            append=1, perm=0644
+        )
+    }
+};
+
+ident (cyrdeliver)/.+ q{
+    prefix(
+        prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+    ) 
+    -> {
+        debug: file(
+            path="@l_prefix@/var/imapd/log/cyrdeliver.log",
+            append=1, perm=0644
+        )
+    }
+};
+
+ident (master)/.+ q{
     prefix(
         prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
     ) 

imapd/imapd.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
 Group:        Mail
 License:      BSD
 Version:      2.1.12
-Release:      20030414
+Release:      20030415
 
 #   package options
 %option       with_vhost_hack  no
@@ -102,6 +102,11 @@ Provides:     IMAP
         -e "s;^\(\$sievedir = \"\).*$;\1$RPM_BUILD_ROOT%{l_prefix}/var/imapd/sieve\"\;;" \
         tools/mkimap
 
+    #   ajdust syslog ident of deliver program
+    %{l_shtool} subst \
+        -e '/config_init/s;"deliver";"cyrdeliver";' \
+        imap/deliver.c
+
 %if "%{with_vhost_hack}" == "yes"
     #   allow @ in LMTP mailbox names
     %{l_patch} -p0 <%{SOURCE vhosthack.patch}