Changeset 214 for trunk/src/sh_readconf.c

Timestamp:

Feb 17, 2009, 10:54:26 PM (16 years ago)

Author:

katerina

Message:

Rewrite mail subsystem for more flexibility (closes ticket #141).

File:

• trunk/src/sh_readconf.c (modified) (4 diffs)

trunk/src/sh_readconf.c

@@ -34 +34 @@
 #include "sh_files.h"
 #include "sh_mail.h"
+#include "sh_nmail.h"
 #include "sh_calls.h"
 #include "sh_tiger.h"
@@ -1098 +1099 @@
   { N_("setmailnum"),        SH_SECTION_MAIL,  SH_SECTION_MISC, 
     sh_mail_setNum },
-  { N_("setmailaddress"),    SH_SECTION_MAIL,  SH_SECTION_MISC, 
-    sh_mail_setaddress },
   { N_("setmailrelay"),      SH_SECTION_MAIL,  SH_SECTION_MISC, 
     sh_mail_set_relay },
@@ -1108 +1107 @@
   { N_("setmailsender"),     SH_SECTION_MAIL,  SH_SECTION_MISC, 
     sh_mail_set_sender },
+  { N_("setmailaddress"),    SH_SECTION_MAIL,  SH_SECTION_MISC, 
+    sh_nmail_add_recipient },
+  { N_("closeaddress"),      SH_SECTION_MAIL,  SH_SECTION_MISC, 
+    sh_nmail_close_recipient },
+  { N_("setaddrseverity"),   SH_SECTION_MAIL,  SH_SECTION_MISC,
+    sh_nmail_set_severity },
   { N_("setmailfilternot"),  SH_SECTION_MAIL,  SH_SECTION_MISC,
-    sh_mail_add_not },
+    sh_nmail_add_not },
   { N_("setmailfilterand"),  SH_SECTION_MAIL,  SH_SECTION_MISC,
-    sh_mail_add_and },
+    sh_nmail_add_and },
   { N_("setmailfilteror"),   SH_SECTION_MAIL,  SH_SECTION_MISC,
-    sh_mail_add_or },
+    sh_nmail_add_or },
 #endif
   { N_("setbindaddress"),    SH_SECTION_MISC,  SH_SECTION_NONE,
@@ -1214 +1219 @@
   static const char  *closing[] = {
     N_("closecommand"),
+    N_("closeaddress"),
     N_("logmonendgroup"),
     N_("logmonendhost"),