From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 20 Sep 2009 07:41:47 +0000 (+0200)
Subject: Tweak keep readall error messages
X-Git-Tag: Release-7.0.0~2616^2~34
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e04961be6a176ec0fbf6a0ac0929b6902725d989;p=bacula%2Fbacula

Tweak keep readall error messages
---

diff --git a/bacula/src/filed/filed.c b/bacula/src/filed/filed.c
index d5e5ada948..15cc707a89 100644
--- a/bacula/src/filed/filed.c
+++ b/bacula/src/filed/filed.c
@@ -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();
diff --git a/bacula/src/lib/priv.c b/bacula/src/lib/priv.c
index 82f416554e..0e9267eb06 100644
--- a/bacula/src/lib/priv.c
+++ b/bacula/src/lib/priv.c
@@ -125,7 +125,7 @@ void drop(char *uname, char *gname, bool keep_readall_caps)
       }
       cap_free(caps);
 #else
-      Emsg0(M_ERROR_TERM, 0, _("Keep readall capabilities is not implemented on this platform yet\n"));
+      Emsg0(M_ERROR_TERM, 0, _("Keep readall caps not implemented this OS or missing libraries.\n"));
 #endif
    } else if (setuid(uid)) {
       berrno be;