Changeset: 8239080392ee for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8239080392ee
Modified Files:
clients/mapiclient/dump.c
monetdb5/mal/mal_authorize.c
Branch: default
Log Message:
Merge with Oct2020 branch.
diffs (36 lines):
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -2799,7 +2799,7 @@ dump_database(Mapi mid, stream *toConsol
if (sname != NULL && strcmp(schema, sname) != 0)
continue;
mnstr_printf(toConsole, "GRANT");
- if (priv == 15) {
+ if (priv == 79) {
mnstr_printf(toConsole, " ALL PRIVILEGES");
} else {
const char *sep = "";
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -653,7 +653,7 @@ msab_pickSecret(char **generated_secret)
}
if (generated_secret)
- *generated_secret = (char*)secret;
+ *generated_secret = secret;
else
free(secret);
return NULL;
diff --git a/monetdb5/mal/mal_authorize.c b/monetdb5/mal/mal_authorize.c
--- a/monetdb5/mal/mal_authorize.c
+++ b/monetdb5/mal/mal_authorize.c
@@ -406,6 +406,8 @@ AUTHinitTables(const char *passwd) {
}
if (!GDKinmemory(0)) {
+ free(master_password);
+ master_password = NULL;
msg = msab_pickSecret(&master_password);
if (msg != NULL)
return msg;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
