Changeset: 562791e0fabf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/562791e0fabf
Modified Files:
tools/merovingian/daemon/proxy.c
Branch: smapi
Log Message:
Proxy even local connections if use_tls is specified
diffs (23 lines):
diff --git a/tools/merovingian/daemon/proxy.c b/tools/merovingian/daemon/proxy.c
--- a/tools/merovingian/daemon/proxy.c
+++ b/tools/merovingian/daemon/proxy.c
@@ -9,6 +9,7 @@
*/
#include "monetdb_config.h"
+#include "utils.h"
#include <sys/types.h>
#include <sys/stat.h> /* stat */
#include <sys/wait.h> /* wait */
@@ -133,7 +134,10 @@ startProxy(int psock, stream *cfdin, str
return(newErr("unsupported protocol/scheme in redirect: %s",
url));
}
- if (ssock != -1) {
+ bool use_tls = getConfNum(_mero_props, "use_tls");
+
+
+ if (ssock != -1 && !use_tls) {
/* UNIX socket connect, don't proxy, but pass socket fd */
struct sockaddr_un server;
struct msghdr msg;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
