diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2014-08-25 12:39:34 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2014-08-25 12:39:34 +0000 |
| commit | 6894492f815707d79c825d04074957412f8cb2aa (patch) | |
| tree | a0b816fe7f75252a1b0d26b0085b8422cd7bcfdf /package/network/services/uhttpd/files | |
| parent | c3738b4413a6fd6c9f715ca718462314dd126a1c (diff) | |
| download | master-187ad058-6894492f815707d79c825d04074957412f8cb2aa.tar.gz master-187ad058-6894492f815707d79c825d04074957412f8cb2aa.tar.bz2 master-187ad058-6894492f815707d79c825d04074957412f8cb2aa.zip | |
uhttpd: do not configure TLS parameters if libustream-ssl is not present
A quite frequent problem after sysupgrading from an older, SSL enabled build
is that ustream-ssl is not installed so uhttpd fails to come up again due to
https listening directives in the preserved configuration.
Skip key/cert and ssl listen options when libustream-ssl.so is not present.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42284 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/uhttpd/files')
| -rwxr-xr-x | package/network/services/uhttpd/files/uhttpd.init | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init index 608aa9d36b..2e94609606 100755 --- a/package/network/services/uhttpd/files/uhttpd.init +++ b/package/network/services/uhttpd/files/uhttpd.init @@ -109,7 +109,7 @@ start_instance() config_get UHTTPD_KEY "$cfg" key /etc/uhttpd.key config_get UHTTPD_CERT "$cfg" cert /etc/uhttpd.crt - [ -n "$https" ] && { + [ -f /lib/libustream-ssl.so ] && [ -n "$https" ] && { [ -f "$UHTTPD_CERT" -a -f "$UHTTPD_KEY" ] || { config_foreach generate_keys cert } |