From b3c443d887736739b9866fb07958b8a845e48474 Mon Sep 17 00:00:00 2001 From: Reyk Floeter Date: Sun, 4 Jan 2015 00:58:43 +0100 Subject: sync with -current --- parse.y | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/parse.y b/parse.y index f787863..e63512b 100644 --- a/parse.y +++ b/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.48 2015/01/03 16:20:31 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.49 2015/01/03 23:54:25 reyk Exp $ */ /* * Copyright (c) 2007 - 2014 Reyk Floeter @@ -1742,6 +1742,8 @@ server_inherit(struct server *src, const char *name, if ((dst->srv_conf.tls_key_file = strdup(src->srv_conf.tls_key_file)) == NULL) fatal("out of memory"); + dst->srv_conf.tls_cert = NULL; + dst->srv_conf.tls_key = NULL; dst->srv_conf.id = ++last_server_id; dst->srv_s = -1; -- cgit v1.2.3-54-g00ecf