MonetDB: smapi - Add tls properties

[Panagiotis Koutsourakis]

Changeset: c56fb13c62b6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c56fb13c62b6
Modified Files:
        tools/merovingian/daemon/merovingian.c
        tools/merovingian/daemon/merovingian.h
Branch: smapi
Log Message:

Add tls properties


diffs (27 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
@@ -439,6 +439,12 @@ main(int argc, char *argv[])
 #else
                {"snapshotcompression", strdup(".tar"),     0,                 
STR},
 #endif
+#ifdef HAVE_OPENSSL
+               {"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,6 +18,7 @@
 #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 -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org