Browse Source

uhttpd: add /etc/uhttpd.key and /etc/uhttpd.crt to conffile hints

SVN-Revision: 23260
Jo-Philipp Wich 15 years ago
parent
commit
88db961cf0
2 changed files with 5 additions and 1 deletions
  1. 2 0
      package/uhttpd/Makefile
  2. 3 1
      package/uhttpd/src/uhttpd.c

+ 2 - 0
package/uhttpd/Makefile

@@ -68,6 +68,8 @@ endef
 
 
 define Package/uhttpd/conffiles
 define Package/uhttpd/conffiles
 /etc/config/uhttpd
 /etc/config/uhttpd
+/etc/uhttpd.crt
+/etc/uhttpd.key
 endef
 endef
 
 
 define Package/uhttpd/install
 define Package/uhttpd/install

+ 3 - 1
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 &&
 						if( conf->lua_state &&
 						    uh_path_match(conf->lua_prefix, req->url) )
 						    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
 						else
 #endif
 #endif