MonetDB: default - Merge with Nov2019 branch.

[Sjoerd Mullender]

Changeset: eb22fdb14289 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=eb22fdb14289
Modified Files:
        gdk/gdk_utils.c
        tools/merovingian/daemon/client.c
Branch: default
Log Message:

Merge with Nov2019 branch.


diffs (56 lines):

diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -2056,6 +2056,7 @@ GDKmmap(const char *path, int mode, size
        void *ret;
 
        if (GDKvm_cursize() + len >= GDK_vm_maxsize) {
+               GDKmemfail("GDKmmap", len);
                GDKerror("allocating too much virtual address space\n");
                return NULL;
        }
@@ -2089,6 +2090,7 @@ GDKmremap(const char *path, int mode, vo
 
        if (*new_size > old_size &&
            GDKvm_cursize() + *new_size - old_size >= GDK_vm_maxsize) {
+               GDKmemfail("GDKmmap", *new_size);
                GDKerror("allocating too much virtual address space\n");
                return NULL;
        }
diff --git a/tools/merovingian/daemon/client.c 
b/tools/merovingian/daemon/client.c
--- a/tools/merovingian/daemon/client.c
+++ b/tools/merovingian/daemon/client.c
@@ -50,6 +50,7 @@ struct clientdata {
        int sock;
        bool isusock;
        struct threads *self;
+       char challenge[32];
 };
 
 static void *
@@ -80,6 +81,7 @@ handleClient(void *data)
        sock = ((struct clientdata *) data)->sock;
        isusock = ((struct clientdata *) data)->isusock;
        self = ((struct clientdata *) data)->self;
+       memcpy(chal, ((struct clientdata *) data)->challenge, sizeof(chal));
        free(data);
        fdin = socket_rstream(sock, "merovingian<-client (read)");
        if (fdin == 0) {
@@ -112,8 +114,6 @@ handleClient(void *data)
        }
 
        /* note: since Jan2012 we speak proto 9 for control connections */
-       chal[31] = '\0';
-       generateSalt(chal, 31);
        mnstr_printf(fout, "%s:merovingian:9:%s:%s:%s:",
                        chal,
                        mcrypt_getHashAlgorithms(),
@@ -624,6 +624,8 @@ acceptConnections(int sock, int usock)
                data->isusock = isusock;
                p->dead = 0;
                data->self = p;
+               data->challenge[31] = '\0';
+               generateSalt(data->challenge, 31);
                if (pthread_create(&p->tid, NULL, handleClient, data) == 0) {
                        p->next = threads;
                        threads = p;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list