Add missing files for xattr and eliminate a few compiler complaints

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

diff --git a/bacula/src/lib/base64.c b/bacula/src/lib/base64.c
index a7e551a88469c548017a6c222af1c56090d8ef75..87ab2c327d75e6425f8a0f64674d66269d12f613 100644 (file)
--- a/bacula/src/lib/base64.c
+++ b/bacula/src/lib/base64.c
@@ -20,7 +20,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
@@ -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];
       }