From f76d33a296d9f0e48b0a6c32bfc87d33fabf3ec9 Mon Sep 17 00:00:00 2001
From: Martin Kosek <mkosek@redhat.com>
Date: Tue, 27 Sep 2011 08:51:31 +0200
Subject: 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 f42da4357eac7e64e803b53c78d6cff9175d20a4.
---
 install/conf/ipa.conf           | 3 +--
 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 2339387a..72e3e4c0 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 cae0964d..1b08382e 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)
-- 
cgit