diff options
author | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 13:07:30 +0200 |
---|---|---|
committer | David Lamparter <equinox@opensourcerouting.org> | 2017-07-14 13:07:30 +0200 |
commit | 2d8270596a085e7a815cebaea21e17cba9e26111 (patch) | |
tree | f9a559f654e7d704ecacc9dadedbe01868615610 /watchfrr | |
parent | *: remove VTYNL, part 6 of 6 (diff) | |
parent | Merge pull request #815 from dwalton76/CMD_WARNING_take2 (diff) | |
download | frr-2d8270596a085e7a815cebaea21e17cba9e26111.tar.xz frr-2d8270596a085e7a815cebaea21e17cba9e26111.zip |
Merge remote-tracking branch 'frr/master' into newline-redux
Lots of conflicts from CMD_WARNING_CONFIG_FAILED...
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'watchfrr')
-rw-r--r-- | watchfrr/watchfrr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c index 3ff4a4096..53d58668d 100644 --- a/watchfrr/watchfrr.c +++ b/watchfrr/watchfrr.c @@ -1294,7 +1294,7 @@ int main(int argc, char **argv) if (watchfrr_di.daemon_mode) { zlog_set_level(ZLOG_DEST_SYSLOG, MIN(gs.loglevel, LOG_DEBUG)); if (daemon (0, 0) < 0) { - fprintf(stderr, "Watchquagga daemon failed: %s", + fprintf(stderr, "Watchfrr daemon failed: %s", strerror(errno)); exit (1); } |