rpms/sssd/devel 0001-Fix-migration-script-for-pre-0.5-local-domains.patch, NONE, 1.1 old_upgrades.patch, 1.1, NONE
Stephen Gallagher
sgallagh at fedoraproject.org
Mon Oct 26 13:17:02 UTC 2009
- Previous message (by thread): rpms/kernel/F-10 kernel.spec,1.1206.2.111,1.1206.2.112
- Next message (by thread): rpms/geoclue/F-12 geoclue-fixgpsd.patch, NONE, 1.1 geoclue-nm08.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 geoclue.spec, 1.18, 1.19 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sgallagh
Update of /cvs/pkgs/rpms/sssd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2878
Added Files:
0001-Fix-migration-script-for-pre-0.5-local-domains.patch
Removed Files:
old_upgrades.patch
Log Message:
Accidentally committed the wrong patch.
Removed the incorrect patch and added the correct one.
0001-Fix-migration-script-for-pre-0.5-local-domains.patch:
upgrade_config.py | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
--- NEW FILE 0001-Fix-migration-script-for-pre-0.5-local-domains.patch ---
>From ff5fd17a20037377889b60a73b2b1f470c67c674 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek at redhat.com>
Date: Mon, 26 Oct 2009 12:54:38 +0100
Subject: [PATCH] Fix migration script for pre-0.5 local domains
Configuration files before 0.5.0 did not enforce provider= in local
domains it did special-case by domain name (LOCAL). Our script was
relying on provider= value, this patch adds the special-casing in case
the domain was called LOCAL.
---
server/upgrade/upgrade_config.py | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/server/upgrade/upgrade_config.py b/server/upgrade/upgrade_config.py
index 87e3990..fe20811 100644
--- a/server/upgrade/upgrade_config.py
+++ b/server/upgrade/upgrade_config.py
@@ -25,6 +25,7 @@ import sys
import shutil
import traceback
from ConfigParser import RawConfigParser
+from ConfigParser import NoOptionError
from optparse import OptionParser
class SSSDConfigParser(RawConfigParser):
@@ -211,11 +212,19 @@ class SSSDConfigFile(object):
self._migrate_kw(new_domsec, old_domsec, ldap_kw)
self._migrate_kw(new_domsec, old_domsec, krb5_kw)
+ # configuration files before 0.5.0 did not enforce provider= in local domains
+ # it did special-case by domain name (LOCAL)
+ try:
+ prv = self._new_config.get(new_domsec, 'id_provider')
+ except NoOptionError:
+ if old_domsec == 'domains/LOCAL':
+ prv = 'local'
+ self._new_config.set(new_domsec, 'id_provider', prv)
+
# if domain was local, update with parameters from [user_defaults]
- if self._new_config.get(new_domsec, 'id_provider') == 'local':
+ if prv == 'local':
self._migrate_kw(new_domsec, 'user_defaults', user_defaults_kw)
-
def _migrate_domains(self):
for domain in [ s.replace('domains/','') for s in self._config.sections() if s.startswith("domains/") ]:
domain = domain.strip()
--
1.6.2.5
--- old_upgrades.patch DELETED ---
- Previous message (by thread): rpms/kernel/F-10 kernel.spec,1.1206.2.111,1.1206.2.112
- Next message (by thread): rpms/geoclue/F-12 geoclue-fixgpsd.patch, NONE, 1.1 geoclue-nm08.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 geoclue.spec, 1.18, 1.19 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list