summaryrefslogtreecommitdiffstats
path: root/usr.sbin/nginx/src/http
diff options
context:
space:
mode:
authorrobert <robert@openbsd.org>2012-10-28 15:41:45 +0000
committerrobert <robert@openbsd.org>2012-10-28 15:41:45 +0000
commita6275a899cd46fa9a7b54e8ffccf346e51a8ef3f (patch)
tree4116ad6bed763e66a79df9f69997b0faf5714223 /usr.sbin/nginx/src/http
parentSave and restore %ebx across the call to read. Otherwise we load the first (diff)
downloadwireguard-openbsd-a6275a899cd46fa9a7b54e8ffccf346e51a8ef3f.tar.xz
wireguard-openbsd-a6275a899cd46fa9a7b54e8ffccf346e51a8ef3f.zip
strip the chroot path from auth_basic_user_file if necessary
Diffstat (limited to 'usr.sbin/nginx/src/http')
-rw-r--r--usr.sbin/nginx/src/http/modules/ngx_http_auth_basic_module.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/usr.sbin/nginx/src/http/modules/ngx_http_auth_basic_module.c b/usr.sbin/nginx/src/http/modules/ngx_http_auth_basic_module.c
index ec3b1cf9500..0bc39bbba17 100644
--- a/usr.sbin/nginx/src/http/modules/ngx_http_auth_basic_module.c
+++ b/usr.sbin/nginx/src/http/modules/ngx_http_auth_basic_module.c
@@ -464,6 +464,10 @@ ngx_http_auth_basic_user_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));
+ if (ngx_chrooted) {
+ ngx_strip_chroot(&value[1]);
+ }
+
ccv.cf = cf;
ccv.value = &value[1];
ccv.complex_value = &alcf->user_file;