summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2017-03-10 04:11:00 +0000
committerDamien Miller <djm@mindrot.org>2017-03-10 15:35:39 +1100
commit67eed24bfa7645d88fa0b883745fccb22a0e527e (patch)
tree9b4a20f962891e040ca536ae594d56ff622fac0c /servconf.c
parent183ba55aaaecca0206184b854ad6155df237adbe (diff)
upstream commit
Remove old null check from config dumper. Patch from jjelen at redhat.com vi bz#2687, ok djm@ Upstream-ID: 824ab71467b78c4bab0dd1b3a38e8bc5f63dd528
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/servconf.c b/servconf.c
index 2f8e29d4c..725886e8c 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
1 1
2/* $OpenBSD: servconf.c,v 1.304 2017/02/03 23:01:19 djm Exp $ */ 2/* $OpenBSD: servconf.c,v 1.305 2017/03/10 04:11:00 dtucker Exp $ */
3/* 3/*
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
5 * All rights reserved 5 * All rights reserved
@@ -2159,8 +2159,6 @@ dump_cfg_fmtint(ServerOpCodes code, int val)
2159static void 2159static void
2160dump_cfg_string(ServerOpCodes code, const char *val) 2160dump_cfg_string(ServerOpCodes code, const char *val)
2161{ 2161{
2162 if (val == NULL)
2163 return;
2164 printf("%s %s\n", lookup_opcode_name(code), 2162 printf("%s %s\n", lookup_opcode_name(code),
2165 val == NULL ? "none" : val); 2163 val == NULL ? "none" : val);
2166} 2164}