Don't leak docroot in the error message if the default index file is missing.

OK florian@

diff --git a/usr.sbin/httpd/server_file.c b/usr.sbin/httpd/server_file.c
index c4814a0..5a36029 100644 (file)
--- a/usr.sbin/httpd/server_file.c
+++ b/usr.sbin/httpd/server_file.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: server_file.c,v 1.13 2014/07/25 13:10:18 reyk Exp $   */
+/*     $OpenBSD: server_file.c,v 1.14 2014/07/25 20:13:06 reyk Exp $   */
 
 /*
  * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org>
@@ -89,7 +89,8 @@ server_file_access(struct http_descriptor *desc, char *path, size_t len,
                }
 
                /* Check again but set len to 0 to avoid recursion */
-               return (server_file_access(desc, path, 0, st));
+               if (server_file_access(desc, path, 0, st) != 0)
+                       goto fail;
        } else if (!S_ISREG(st->st_mode)) {
                /* Don't follow symlinks and ignore special files */
                errno = EACCES;