Merge branch 'raphpen-dev' into dev

This commit is contained in:
Simone Mainardi 2019-01-09 12:26:43 +01:00
commit d95d8541f3
10 changed files with 186 additions and 29 deletions

View file

@ -1173,6 +1173,12 @@ function printAuthentication()
printAuthDuration()
-- Note: order must correspond to evaluation order in Ntop.cpp
print('<tr><th class="info" colspan="2">'..i18n("prefs.client_x509_auth")..'</th></tr>')
prefsToggleButton(subpage_active,{
field = "toggle_client_x509_auth",
default = "0",
pref = "is_client_x509_auth_enabled",
})
if not entries.toggle_ldap_auth.hidden then
printLdapAuth()
end