Always require SSL in the Kerberos authorization block.

This also corrects a slight bug where if add is True then we always
re-update the file.

https://fedorahosted.org/freeipa/ticket/1755
This commit is contained in:
Rob Crittenden
2011-09-23 11:46:59 -04:00
committed by Martin Kosek
parent 060eea5f03
commit 384d4e8f50
2 changed files with 3 additions and 2 deletions

View File

@@ -1,5 +1,5 @@
# #
# VERSION 2 - DO NOT REMOVE THIS LINE # VERSION 3 - DO NOT REMOVE THIS LINE
# #
# LoadModule auth_kerb_module modules/mod_auth_kerb.so # LoadModule auth_kerb_module modules/mod_auth_kerb.so
@@ -45,6 +45,7 @@ WSGIScriptReloading Off
# Protect /ipa with Kerberos # Protect /ipa with Kerberos
<Location "/ipa"> <Location "/ipa">
NSSRequireSSL
AuthType Kerberos AuthType Kerberos
AuthName "Kerberos Login" AuthName "Kerberos Login"
KrbMethodNegotiate on KrbMethodNegotiate on

View File

@@ -116,7 +116,7 @@ def upgrade(sub_dict, filename, template, add=False):
if new < 0: if new < 0:
print "%s not found." % template print "%s not found." % template
if old < new or add: if old < new:
backup_file(filename, new) backup_file(filename, new)
update_conf(sub_dict, filename, template) update_conf(sub_dict, filename, template)
print "Upgraded %s to version %d" % (filename, new) print "Upgraded %s to version %d" % (filename, new)