Changeset: 8b5bd4db8f64 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8b5bd4db8f64
Modified Files:
common/stream/stream.c
tools/merovingian/daemon/proxy.c
Branch: smapi
Log Message:
Fix compilation under STREAM_DEBUG
diffs (36 lines):
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -537,7 +537,7 @@ mnstr_fsync(stream *s)
return -1;
#ifdef STREAM_DEBUG
fprintf(stderr, "fsync %s (%d)\n",
- s->name ? s->name : "<unnamed>", s->errnr);
+ s->name ? s->name : "<unnamed>", s->errkind);
#endif
assert(!s->readonly);
if (s->errkind != MNSTR_NO__ERROR)
@@ -675,7 +675,7 @@ mnstr_set_bigendian(stream *s, bool bige
#ifdef STREAM_DEBUG
fprintf(stderr, "mnstr_set_bigendian %s %s\n",
s->name ? s->name : "<unnamed>",
- swapbytes ? "true" : "false");
+ bigendian ? "true" : "false");
#endif
assert(s->readonly);
s->binary = true;
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
@@ -136,11 +136,6 @@ startProxy(int psock, stream *cfdin, str
bool use_tls = getConfNum(_mero_props, "use_tls");
-
- /* TODO: proxy if tls was established, even with UNIX sockets.
- * I therefore need to correctly open the UNIX socket in case
- * of TLS connection.
- * */
if (ssock != -1 ) {
struct sockaddr_un server;
struct msghdr msg;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
