[openssh-commits] [openssh] 02/07: upstream: remove size_t gl_pathc < 0 test, it is invalid. the

[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 40598b85d72a509566b7b2a6d57676c7231fed34
Author: deraadt at openbsd.org <deraadt at openbsd.org>
Date:   Wed Nov 13 05:42:26 2019 +0000

    upstream: remove size_t gl_pathc < 0 test, it is invalid. the
    
    return value from glob() is sufficient. discussed with djm
    
    OpenBSD-Commit-ID: c91203322db9caaf7efaf5ae90c794a91070be3c
---
 readconf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/readconf.c b/readconf.c
index b7a1caa1..66fb0d2b 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.312 2019/11/13 04:47:52 deraadt Exp $ */
+/* $OpenBSD: readconf.c,v 1.313 2019/11/13 05:42:26 deraadt Exp $ */
 /*
  * Author: Tatu Ylonen <ylo at cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
@@ -1559,12 +1559,12 @@ parse_keytypes:
 				    "files",filename, linenum, arg2);
 				free(arg2);
 				continue;
-			} else if (r != 0 || gl.gl_pathc < 0)
+			} else if (r != 0)
 				fatal("%.200s line %d: glob failed for %s.",
 				    filename, linenum, arg2);
 			free(arg2);
 			oactive = *activep;
-			for (i = 0; i < (u_int)gl.gl_pathc; i++) {
+			for (i = 0; i < gl.gl_pathc; i++) {
 				debug3("%.200s line %d: Including file %s "
 				    "depth %d%s", filename, linenum,
 				    gl.gl_pathv[i], depth,

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