]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: remove size_t gl_pathc < 0 test, it is invalid. the
authorderaadt@openbsd.org <deraadt@openbsd.org>
Wed, 13 Nov 2019 05:42:26 +0000 (05:42 +0000)
committerDamien Miller <djm@mindrot.org>
Thu, 14 Nov 2019 21:50:10 +0000 (08:50 +1100)
return value from glob() is sufficient. discussed with djm

OpenBSD-Commit-ID: c91203322db9caaf7efaf5ae90c794a91070be3c

readconf.c

index b7a1caa111f45039f17ddb5b3a1c43b829a304e2..66fb0d2bbee9c5218209c863c8943a8ec1cafee3 100644 (file)
@@ -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@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@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,