Changeset: bb4e20108377 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/bb4e20108377
Modified Files:
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/merovingian.h
Branch: smapi
Log Message:
Remove tls_port property
diffs (22 lines):
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -443,7 +443,6 @@ main(int argc, char *argv[])
{"tls_cert", NULL, 0,
STR},
{"tls_key", NULL, 0,
STR},
{"use_tls", strdup("false"), 0,
BOOLEAN},
- {"tls_port", strdup(MERO_TLS_PORT),
atoi(MERO_TLS_PORT),INT},
#endif
{ NULL, NULL, 0,
INVALID}
diff --git a/tools/merovingian/daemon/merovingian.h
b/tools/merovingian/daemon/merovingian.h
--- a/tools/merovingian/daemon/merovingian.h
+++ b/tools/merovingian/daemon/merovingian.h
@@ -18,7 +18,6 @@
#include "utils/utils.h" /* confkeyval, loglevel */
#define MERO_PORT MAPI_PORT_STR
-#define MERO_TLS_PORT "50443" /* TODO: Parametrize */
#define MERO_SOCK ".s.monetdb."
#define CONTROL_SOCK ".s.merovingian."
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
