Merge branch 'master' into basejobv3

[bacula/bacula] / bacula / src / filed / filed.c

diff --git a/bacula/src/filed/filed.c b/bacula/src/filed/filed.c
index d5e5ada948a716963e2c5b124745f3b34076cf8e..a8ee0b216302104e144b9309e4023a34ded164a4 100644 (file)
--- a/bacula/src/filed/filed.c
+++ b/bacula/src/filed/filed.c
@@ -79,7 +79,7 @@ PROG_COPYRIGHT
 "Usage: bacula-fd [-f -s] [-c config_file] [-d debug_level]\n"
 "        -c <file>   use <file> as configuration file\n"
 "        -d <nn>     set debug level to <nn>\n"
-"        -dt         print timestamp in debug output\n"
+"        -dt         print a timestamp in debug output\n"
 "        -f          run in foreground (for debugging)\n"
 "        -g          groupid\n"
 "        -k          keep readall capabilities\n"
@@ -192,8 +192,7 @@ int main (int argc, char *argv[])
    }
 
    if (!uid && keep_readall_caps) {
-      Emsg0(M_ERROR, 0, _("-k option has no meaning without -u option.\n"));
-      exit(1);
+      Emsg0(M_ERROR_TERM, 0, _("-k option has no meaning without -u option.\n"));
    }
 
    server_tid = pthread_self();