kes Return correct string from authenticate.cpp in bat when connecting

[bacula/bacula] / bacula / src / findlib / save-cwd.c

diff --git a/bacula/src/findlib/save-cwd.c b/bacula/src/findlib/save-cwd.c
index 35508014021d1a6c79660478c6cc3ab9af05529c..f1fa8c47886a0f095d53c3583231710e8304113c 100644 (file)
--- a/bacula/src/findlib/save-cwd.c
+++ b/bacula/src/findlib/save-cwd.c
@@ -27,8 +27,8 @@
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation plus additions
-   that are listed in the file LICENSE.
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
 
    This program is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -74,7 +74,7 @@ save_cwd(struct saved_cwd *cwd)
       cwd->desc = open(".", O_RDONLY);
       if (cwd->desc < 0) {
          berrno be;
-         Emsg1(M_ERROR, 0, _("Cannot open current directory: %s\n"), be.strerror());
+         Emsg1(M_ERROR, 0, _("Cannot open current directory: %s\n"), be.bstrerror());
          return 1;
       }
 
@@ -88,7 +88,7 @@ save_cwd(struct saved_cwd *cwd)
               have_working_fchdir = 0;
           } else {
               berrno be;
-              Emsg1(M_ERROR, 0, _("Current directory: %s\n"), be.strerror());
+              Emsg1(M_ERROR, 0, _("Current directory: %s\n"), be.bstrerror());
               close(cwd->desc);
               cwd->desc = -1;
               return 1;
@@ -110,7 +110,7 @@ save_cwd(struct saved_cwd *cwd)
       cwd->name = (POOLMEM *)getcwd(buf, sizeof_pool_memory(buf));
       if (cwd->name == NULL) {
          berrno be;
-         Emsg1(M_ERROR, 0, _("Cannot get current directory: %s\n"), be.strerror());
+         Emsg1(M_ERROR, 0, _("Cannot get current directory: %s\n"), be.bstrerror());
          free_pool_memory(buf);
          return 1;
       }
@@ -132,28 +132,28 @@ restore_cwd(const struct saved_cwd *cwd, const char *dest, const char *from)
          if (from) {
             if (dest) {
                Emsg3(M_ERROR, 0, _("Cannot return to %s from %s: %s\n"),
-                  dest, from, be.strerror());
+                  dest, from, be.bstrerror());
             }
             else {
                Emsg2(M_ERROR, 0, _("Cannot return to saved working directory from %s: %s\n"),
-                  from, be.strerror());
+                  from, be.bstrerror());
             }
          }
          else {
             if (dest) {
                Emsg2(M_ERROR, 0, _("Cannot return to %s: %s\n"),
-                  dest, be.strerror());
+                  dest, be.bstrerror());
             }
             else {
                Emsg1(M_ERROR, 0, _("Cannot return to saved working directory: %s\n"),
-                  be.strerror());
+                  be.bstrerror());
             }
          }
          fail = 1;
       }
   } else if (chdir(cwd->name) < 0) {
       berrno be;
-      Emsg2(M_ERROR, 0, "%s: %s\n", cwd->name, be.strerror());
+      Emsg2(M_ERROR, 0, "%s: %s\n", cwd->name, be.bstrerror());
       fail = 1;
   }
   return fail;