static const char *config_keys[] =
{
- "SMTPHost",
+ "SMTPServer",
"SMTPPort",
"SMTPUser",
"SMTPPassword",
- "SMTPFrom",
- "SMTPSubject",
- "EmailTo"
+ "From",
+ "Recipient",
+ "Subject"
};
static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
static char *smtp_host = NULL;
static char *smtp_user = NULL;
static char *smtp_password = NULL;
-static char *smtp_from = NULL;
-static char *smtp_subject = NULL;
+static char *email_from = NULL;
+static char *email_subject = NULL;
#define DEFAULT_SMTP_HOST "localhost"
#define DEFAULT_SMTP_FROM "root@localhost"
/* Callback to get username and password */
static int authinteract (auth_client_request_t request, char **result,
- int fields, void *arg)
+ int fields, void __attribute__((unused)) *arg)
{
int i;
for (i = 0; i < fields; i++)
/* Callback to print the recipient status */
static void print_recipient_status (smtp_recipient_t recipient,
- const char *mailbox, void *arg)
+ const char *mailbox, void __attribute__((unused)) *arg)
{
const smtp_status_t *status;
} /* void print_recipient_status */
/* Callback to monitor SMTP activity */
-static void monitor_cb (const char *buf, int buflen, int writing, void *arg)
+static void monitor_cb (const char *buf, int buflen, int writing,
+ void __attribute__((unused)) *arg)
{
char log_str[MAXSTRING];
static int notify_email_config (const char *key, const char *value)
{
- if (strcasecmp (key, "EmailTo") == 0)
+ if (strcasecmp (key, "Recipient") == 0)
{
char **tmp;
}
recipients_len++;
}
- else if (0 == strcasecmp (key, "SMTPHost")) {
+ else if (0 == strcasecmp (key, "SMTPServer")) {
sfree (smtp_host);
smtp_host = strdup (value);
}
sfree (smtp_password);
smtp_password = strdup (value);
}
- else if (0 == strcasecmp (key, "SMTPFrom")) {
- sfree (smtp_from);
- smtp_from = strdup (value);
+ else if (0 == strcasecmp (key, "From")) {
+ sfree (email_from);
+ email_from = strdup (value);
}
- else if (0 == strcasecmp (key, "SMTPSubject")) {
- sfree (smtp_subject);
- smtp_subject = strdup (value);
+ else if (0 == strcasecmp (key, "Subject")) {
+ sfree (email_subject);
+ email_subject = strdup (value);
}
else {
return -1;
return 0;
} /* int notify_email_config (const char *, const char *) */
-static int notify_email_notification (const notification_t *n)
+static int notify_email_notification (const notification_t *n,
+ user_data_t __attribute__((unused)) *user_data)
{
smtp_recipient_t recipient;
: ((n->severity == NOTIF_OKAY) ? "OKAY" : "UNKNOWN")));
ssnprintf (subject, sizeof (subject),
- (smtp_subject == NULL) ? DEFAULT_SMTP_SUBJECT : smtp_subject,
+ (email_subject == NULL) ? DEFAULT_SMTP_SUBJECT : email_subject,
severity, n->host);
localtime_r (&n->time, ×tamp_tm);
ERROR ("notify_email plugin: cannot set SMTP message");
return (-1);
}
- smtp_set_reverse_path (message, smtp_from);
+ smtp_set_reverse_path (message, email_from);
smtp_set_header (message, "To", NULL, NULL);
smtp_set_message_str (message, buf);
plugin_register_shutdown ("notify_email", notify_email_shutdown);
plugin_register_config ("notify_email", notify_email_config,
config_keys, config_keys_num);
- plugin_register_notification ("notify_email", notify_email_notification);
+ plugin_register_notification ("notify_email", notify_email_notification,
+ /* user_data = */ NULL);
} /* void module_register (void) */
/* vim: set sw=2 sts=2 ts=8 et : */