diff options
| author | Reyk Floeter <reyk@esdenera.com> | 2015-01-04 00:58:43 +0100 |
|---|---|---|
| committer | Reyk Floeter <reyk@esdenera.com> | 2015-01-04 00:58:43 +0100 |
| commit | b3c443d887736739b9866fb07958b8a845e48474 (patch) | |
| tree | 683905ab44f5321939e79f11c5b2a29308d8591e | |
| parent | 4f5dd228f08c132afdef71c1a5a124595905d8ae (diff) | |
| download | httpd-b3c443d887736739b9866fb07958b8a845e48474.tar.gz httpd-b3c443d887736739b9866fb07958b8a845e48474.zip | |
sync with -current
| -rw-r--r-- | parse.y | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 <reyk@openbsd.org> @@ -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; |