diff options
| author | Martin Kosek <mkosek@redhat.com> | 2011-09-27 08:56:19 +0200 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2011-09-27 08:56:50 +0200 |
| commit | d6d73fd8a8c0b5af02f6e12f1d6acea8bbc448c6 (patch) | |
| tree | a054a96d1c32d398c2a480b4c2683f7dfd6c441a | |
| parent | 63182c963b230457db84e009171ec35144e15919 (diff) | |
| download | freeipa-d6d73fd8a8c0b5af02f6e12f1d6acea8bbc448c6.tar.gz freeipa-d6d73fd8a8c0b5af02f6e12f1d6acea8bbc448c6.tar.xz freeipa-d6d73fd8a8c0b5af02f6e12f1d6acea8bbc448c6.zip | |
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 384d4e8f5018aa1f829139572fa29abef375c5a3.
| -rw-r--r-- | install/conf/ipa.conf | 3 | ||||
| -rw-r--r-- | install/tools/ipa-upgradeconfig | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/install/conf/ipa.conf b/install/conf/ipa.conf index 2339387a7..72e3e4c01 100644 --- a/install/conf/ipa.conf +++ b/install/conf/ipa.conf @@ -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 @@ -45,7 +45,6 @@ WSGIScriptReloading Off # Protect /ipa with Kerberos <Location "/ipa"> - NSSRequireSSL AuthType Kerberos AuthName "Kerberos Login" KrbMethodNegotiate on diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig index cae0964d5..1b08382e4 100644 --- a/install/tools/ipa-upgradeconfig +++ b/install/tools/ipa-upgradeconfig @@ -116,7 +116,7 @@ def upgrade(sub_dict, filename, template, add=False): if new < 0: print "%s not found." % template - if old < new: + if old < new or add: backup_file(filename, new) update_conf(sub_dict, filename, template) print "Upgraded %s to version %d" % (filename, new) |