Split base64 code into a separate .c so that the server doesn't pull

[disorder] / lib / trackdb.c

diff --git a/lib/trackdb.c b/lib/trackdb.c
index dc4cd4eda49009de2a41cd90426e5dd56bdcc309..e030665116e6ffb380ef20c14679e5d0d99a15b3 100644 (file)
--- a/lib/trackdb.c
+++ b/lib/trackdb.c
@@ -64,7 +64,7 @@
 #include "hash.h"
 #include "unicode.h"
 #include "unidata.h"
-#include "mime.h"
+#include "base64.h"
 
 #define RESCAN "disorder-rescan"
 #define DEADLOCK "disorder-deadlock"
@@ -2493,7 +2493,7 @@ static int one_old_user(const char *user, const char *password,
     rights_type r;
 
     parse_rights(config->default_rights, &r, 1);
-    r &= (RIGHT_SCRATCH__MASK|RIGHT_MOVE__MASK|RIGHT_REMOVE__MASK);
+    r &= ~(rights_type)(RIGHT_SCRATCH__MASK|RIGHT_MOVE__MASK|RIGHT_REMOVE__MASK);
     r |= (RIGHT_ADMIN|RIGHT_RESCAN
           |RIGHT_SCRATCH_ANY|RIGHT_MOVE_ANY|RIGHT_REMOVE_ANY);
     rights = rights_string(r);