Cleanup attribute catalog insert errors + cancel SD only once

[bacula/bacula] / bacula / src / lib / base64.c

diff --git a/bacula/src/lib/base64.c b/bacula/src/lib/base64.c
index c2d39dc3dd3bd5e609c1d6a46d246f26fe6a6ec0..02e42639c711681d250ec6b1bf0f17e0c6705838 100644 (file)
--- a/bacula/src/lib/base64.c
+++ b/bacula/src/lib/base64.c
@@ -177,7 +177,7 @@ bin_to_base64(char *buf, int buflen, char *bin, int binlen, int compatible)
    if (rem && j < buflen) {
       mask = (1 << rem) - 1;
       if (compatible) {
-         buf[j++] = base64_digits[(reg & mask) << 6 - rem];
+         buf[j++] = base64_digits[(reg & mask) << (6 - rem)];
       } else {
          buf[j++] = base64_digits[reg & mask];
       }
@@ -251,7 +251,7 @@ int main(int argc, char *argv[])
          printf("Cannot stat %s: %s\n", fname, be.bstrerror(errno));
          continue;
       }
-      encode_stat(where, &statp);
+      encode_stat(where, &statp, 0, 0);
 
       printf("Encoded stat=%s\n", where);
 
@@ -297,7 +297,7 @@ int main(int argc, char *argv[])
           statp.st_ctime != statn.st_ctime) {
 
          printf("%s: %s\n", fname, where);
-         encode_stat(where, &statn);
+         encode_stat(where, &statn, 0, 0);
          printf("%s: %s\n", fname, where);
          printf("NOT EQAL\n");
       }