aboutsummaryrefslogtreecommitdiff
path: root/degesch.c
diff options
context:
space:
mode:
Diffstat (limited to 'degesch.c')
-rw-r--r--degesch.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/degesch.c b/degesch.c
index 543601e..9276b8b 100644
--- a/degesch.c
+++ b/degesch.c
@@ -1868,7 +1868,7 @@ serialize_configuration (struct app_context *ctx, struct str *output)
/// Builds a color pair for 256-color terminals with a 16-color backup value
#define COLOR_256(name, c256) \
- (((COLOR_ ## name) & 0xFFFF) | ((c256 & 0xFFFF) << 16))
+ (((COLOR_ ## name) & 0xFFFF) | (((c256) & 0xFFFF) << 16))
static struct
{
@@ -4288,6 +4288,7 @@ transport_tls_init (struct server *s, struct error **e)
// XXX: is this a reason to abort the connection?
log_server_error (s, s->buffer, "#s", error->message);
error_free (error);
+ error = NULL;
}
SSL_set_connect_state (ssl);