Changeset: 3c24358af9cb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3c24358af9cb
Modified Files:
testing/Mtest.py.in
testing/Mz.py.in
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/argvcmds.c
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/daemon/multiplex-funnel.c
Branch: default
Log Message:
Merge with Jan2022 branch.
diffs (157 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2834,8 +2834,8 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
try:
sql.connect(username=user or 'monetdb',
password=passwd or 'monetdb',
- hostname='localhost',
- port=int(env['MAPIPORT']),
+ hostname=HOST,
+ port=int(pSrvr.port),
database=TSTDB,
language=lang,
timeout=TIMEOUT)
diff --git a/tools/merovingian/daemon/controlrunner.c
b/tools/merovingian/daemon/controlrunner.c
--- a/tools/merovingian/daemon/controlrunner.c
+++ b/tools/merovingian/daemon/controlrunner.c
@@ -150,7 +150,7 @@ recvWithTimeout(int msgsock, stream *fdi
}
}
-char
+bool
control_authorise(
const char *host,
const char *chal,
@@ -166,7 +166,7 @@ control_authorise(
Mlevelfprintf(INFORMATION, _mero_ctlout, "%s: remote control
disabled\n", host);
mnstr_printf(fout, "!access denied\n");
mnstr_flush(fout, MNSTR_FLUSH_DATA);
- return 0;
+ return false;
}
pwd = mcrypt_hashPassword(algo,
@@ -175,7 +175,7 @@ control_authorise(
Mlevelfprintf(ERROR, _mero_ctlout, "%s: Allocation failure
during authentication\n", host);
mnstr_printf(fout, "!allocation failure\n");
mnstr_flush(fout, MNSTR_FLUSH_DATA);
- return 0;
+ return false;
}
if (strcmp(pwd, passwd) != 0) {
free(pwd);
@@ -183,14 +183,14 @@ control_authorise(
"(bad passphrase)\n", host);
mnstr_printf(fout, "!access denied\n");
mnstr_flush(fout, MNSTR_FLUSH_DATA);
- return 0;
+ return false;
}
free(pwd);
mnstr_printf(fout, "=OK\n");
mnstr_flush(fout, MNSTR_FLUSH_DATA);
- return 1;
+ return true;
}
#define send_client(P)
\
diff --git a/tools/merovingian/daemon/controlrunner.h
b/tools/merovingian/daemon/controlrunner.h
--- a/tools/merovingian/daemon/controlrunner.h
+++ b/tools/merovingian/daemon/controlrunner.h
@@ -11,7 +11,7 @@
#include "stream.h"
-char control_authorise(const char *host, const char *chal, const char *algo,
const char *passwd, stream *fout);
+bool control_authorise(const char *host, const char *chal, const char *algo,
const char *passwd, stream *fout);
void control_handleclient(const char *host, int sock, stream *fdin, stream
*fdout);
void *controlRunner(void *d);
diff --git a/tools/merovingian/daemon/discoveryrunner.c
b/tools/merovingian/daemon/discoveryrunner.c
--- a/tools/merovingian/daemon/discoveryrunner.c
+++ b/tools/merovingian/daemon/discoveryrunner.c
@@ -178,7 +178,7 @@ getRemoteDB(const char *database)
pdb = &dummy;
while (rdb != NULL) {
snprintf(mfullname, sizeof(mfullname), "%s/", rdb->fullname);
- if (db_glob(mdatabase, mfullname) == 1) {
+ if (db_glob(mdatabase, mfullname)) {
/* create a fake sabdb struct, chain where necessary */
if (walk != NULL) {
walk = walk->next = malloc(sizeof(sabdb));
diff --git a/tools/merovingian/daemon/multiplex-funnel.c
b/tools/merovingian/daemon/multiplex-funnel.c
--- a/tools/merovingian/daemon/multiplex-funnel.c
+++ b/tools/merovingian/daemon/multiplex-funnel.c
@@ -125,7 +125,7 @@ MFconnectionManager(void *d)
if (len >= 4 &&
buf[len - 3] ==
'*' && buf[len - 4] == '/')
buf[len - 2] = '\0';
- if (db_glob(buf, msg + 1) == 1)
{
+ if (db_glob(buf, msg + 1)) {
sabdb *stats;
Mapi tm = NULL;
/* match! eat away
trailing / (for matching) */
@@ -174,7 +174,7 @@ MFconnectionManager(void *d)
if (len >= 4 &&
buf[len - 3] ==
'*' && buf[len - 4] == '/')
buf[len - 2] = '\0';
- if (db_glob(buf, msg + 1) == 1)
{
+ if (db_glob(buf, msg + 1)) {
/* reevaluate, to see
if connection is still
* available */
sabdb *walk;
diff --git a/tools/merovingian/utils/glob.c b/tools/merovingian/utils/glob.c
--- a/tools/merovingian/utils/glob.c
+++ b/tools/merovingian/utils/glob.c
@@ -20,7 +20,7 @@
/**
* Returns if haystack matches expr, using tag globbing.
*/
-char
+bool
db_glob(const char *expr, const char *haystack)
{
const char *haymem = NULL;
@@ -48,7 +48,7 @@ db_glob(const char *expr, const char *ha
expr++;
if (*expr == '\0') {
/* this will always
match the rest */
- return(1);
+ return(true);
} else if (!escape && *expr ==
'*') {
continue;
} else if (*expr == '\\') {
@@ -65,7 +65,7 @@ db_glob(const char *expr, const char *ha
haymem = haystack + 1;
if (*haystack == '\0')
/* couldn't find it, so no
match */
- return(0);
+ return(false);
break;
}
/* do asterisk match if escaped */
@@ -75,7 +75,7 @@ db_glob(const char *expr, const char *ha
if (haymem != NULL) {
return(db_glob(exprmem,
haymem));
} else {
- return(0);
+ return(false);
}
}
break;
diff --git a/tools/merovingian/utils/glob.h b/tools/merovingian/utils/glob.h
--- a/tools/merovingian/utils/glob.h
+++ b/tools/merovingian/utils/glob.h
@@ -9,7 +9,7 @@
#ifndef _SEEN_GLOB_H
#define _SEEN_GLOB_H 1
-char db_glob(const char *expr, const char *haystack);
+bool db_glob(const char *expr, const char *haystack);
#endif
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
