Revert "Always require SSL in the Kerberos authorization block."

This patch broke installation of a new master. Reverting until
we develop a better solution.

This reverts commit f42da4357e.
This commit is contained in:
Martin Kosek
2011-09-27 08:51:31 +02:00
parent 050d7f0944
commit f76d33a296
2 changed files with 2 additions and 3 deletions

View File

@@ -1,5 +1,5 @@
# #
# VERSION 3 - DO NOT REMOVE THIS LINE # VERSION 2 - DO NOT REMOVE THIS LINE
# #
# LoadModule auth_kerb_module modules/mod_auth_kerb.so # LoadModule auth_kerb_module modules/mod_auth_kerb.so
@@ -45,7 +45,6 @@ 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: if old < new or add:
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)