From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 2 Apr 2010 21:51:30 +0000 (+0200)
Subject: Fix bug #1542 File Daemon outputs usage message to stdout instead of stderr
X-Git-Tag: Release-7.0.0~2012
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bd05876995bc8493c76ce4a51271f8e8f19bef4d;p=bacula%2Fbacula

Fix bug #1542 File Daemon outputs usage message to stdout instead of stderr
---

diff --git a/bacula/src/dird/dird.c b/bacula/src/dird/dird.c
index 493bff07f3..f720d8befd 100644
--- a/bacula/src/dird/dird.c
+++ b/bacula/src/dird/dird.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-20109 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
diff --git a/bacula/src/filed/filed.c b/bacula/src/filed/filed.c
index 9a893f929f..50708d3d48 100644
--- a/bacula/src/filed/filed.c
+++ b/bacula/src/filed/filed.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -71,7 +71,7 @@ static CONFIG *config;
 
 static void usage()
 {
-   Pmsg3(-1, _(
+   fprintf(stderr, _(
 PROG_COPYRIGHT
 "\nVersion: %s (%s)\n\n"
 "Usage: bacula-fd [-f -s] [-c config_file] [-d debug_level]\n"
@@ -88,6 +88,7 @@ PROG_COPYRIGHT
 "        -v          verbose user messages\n"
 "        -?          print this message.\n"
 "\n"), 2000, VERSION, BDATE);
+
    exit(1);
 }
 
diff --git a/bacula/src/stored/stored.c b/bacula/src/stored/stored.c
index 93735c76b4..71f6f9d2a7 100644
--- a/bacula/src/stored/stored.c
+++ b/bacula/src/stored/stored.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2009 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -112,6 +112,7 @@ PROG_COPYRIGHT
 "        -v          verbose user messages\n"
 "        -?          print this message.\n"
 "\n"), 2000, VERSION, BDATE);
+
    exit(1);
 }