aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-10-05 19:34:22 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-10-05 19:34:22 +0000
commit88db961cf0f9a86d052e685fec9b77a8a692f70a (patch)
treed899b690f2e8d89e218302e0e4a37d20f38e14eb
parent073ade43680f6d61ac17cc4e7d3702e7a2d50553 (diff)
downloadupstream-88db961cf0f9a86d052e685fec9b77a8a692f70a.tar.gz
upstream-88db961cf0f9a86d052e685fec9b77a8a692f70a.tar.bz2
upstream-88db961cf0f9a86d052e685fec9b77a8a692f70a.zip
uhttpd: add /etc/uhttpd.key and /etc/uhttpd.crt to conffile hints
SVN-Revision: 23260
-rw-r--r--package/uhttpd/Makefile2
-rw-r--r--package/uhttpd/src/uhttpd.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/package/uhttpd/Makefile b/package/uhttpd/Makefile
index 835e5b5277..29d3ee5b1f 100644
--- a/package/uhttpd/Makefile
+++ b/package/uhttpd/Makefile
@@ -68,6 +68,8 @@ endef
define Package/uhttpd/conffiles
/etc/config/uhttpd
+/etc/uhttpd.crt
+/etc/uhttpd.key
endef
define Package/uhttpd/install
diff --git a/package/uhttpd/src/uhttpd.c b/package/uhttpd/src/uhttpd.c
index a818e1c450..86b7e63dd1 100644
--- a/package/uhttpd/src/uhttpd.c
+++ b/package/uhttpd/src/uhttpd.c
@@ -558,7 +558,9 @@ static void uh_mainloop(struct config *conf, fd_set serv_fds, int max_fd)
if( conf->lua_state &&
uh_path_match(conf->lua_prefix, req->url) )
{
- conf->lua_request(cl, req, conf->lua_state);
+ /* auth ok? */
+ if( uh_auth_check(cl, req, pin) )
+ conf->lua_request(cl, req, conf->lua_state);
}
else
#endif