mdadm: respect --syslog in monitor mode

A few places don't accept syslog as a monitor mode, so fix that.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/Monitor.c b/Monitor.c
index 337785d67fc531da21978ff025a97d61361995e7..a3ea72479a9dbf80547ce4b235d573c7acaac9c7 100644 (file)
--- a/Monitor.c
+++ b/Monitor.c
@@ -143,7 +143,7 @@ int Monitor(struct mddev_dev *devlist,
                        fprintf(stderr, Name ": Monitor using program \"%s\" from config file\n",
                               alert_cmd);
        }
                        fprintf(stderr, Name ": Monitor using program \"%s\" from config file\n",
                               alert_cmd);
        }

-       if (scan && !mailaddr && !alert_cmd) {
+       if (scan && !mailaddr && !alert_cmd && !dosyslog) {

                fprintf(stderr, Name ": No mail address or alert command - not monitoring.\n");
                return 1;
        }
                fprintf(stderr, Name ": No mail address or alert command - not monitoring.\n");
                return 1;
        }


@@ -335,7 +335,7 @@ static void alert(char *event, char *dev, char *disc, struct alert_info *info)
 {
        int priority;
 
 {
        int priority;
 

-       if (!info->alert_cmd && !info->mailaddr) {
+       if (!info->alert_cmd && !info->mailaddr && !info->dosyslog) {

                time_t now = time(0);
 
                printf("%1.15s: %s on %s %s\n", ctime(&now)+4, event, dev, disc?disc:"unknown device");
                time_t now = time(0);
 
                printf("%1.15s: %s on %s %s\n", ctime(&now)+4, event, dev, disc?disc:"unknown device");