[openssh-commits] [openssh] 06/11: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 67eed24bfa7645d88fa0b883745fccb22a0e527e
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Fri Mar 10 04:11:00 2017 +0000

    upstream commit
    
    Remove old null check from config dumper.  Patch from
    jjelen at redhat.com vi bz#2687, ok djm@
    
    Upstream-ID: 824ab71467b78c4bab0dd1b3a38e8bc5f63dd528
---
 servconf.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/servconf.c b/servconf.c
index 2f8e29d..725886e 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
 
-/* $OpenBSD: servconf.c,v 1.304 2017/02/03 23:01:19 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.305 2017/03/10 04:11:00 dtucker Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -2159,8 +2159,6 @@ dump_cfg_fmtint(ServerOpCodes code, int val)
 static void
 dump_cfg_string(ServerOpCodes code, const char *val)
 {
-	if (val == NULL)
-		return;
 	printf("%s %s\n", lookup_opcode_name(code),
 	    val == NULL ? "none" : val);
 }

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.