rpms/sssd/F-11 0001-Fix-migration-script-for-pre-0.5-local-domains.patch, NONE, 1.1 sssd.spec, 1.23, 1.24
Stephen Gallagher
sgallagh at fedoraproject.org
Mon Oct 26 13:43:50 UTC 2009
- Previous message (by thread): rpms/squidGuard/F-12 squidGuard-1.4-20091015.patch, NONE, 1.1 squidGuard-1.4-20091019.patch, NONE, 1.1 squidGuard.spec, 1.20, 1.21
- Next message (by thread): rpms/nrpe/devel import.log,1.2,1.3 nrpe.spec,1.16,1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sgallagh
Update of /cvs/pkgs/rpms/sssd/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9698
Modified Files:
sssd.spec
Added Files:
0001-Fix-migration-script-for-pre-0.5-local-domains.patch
Log Message:
Fix upgrade issues from old (pre-0.5.0) releases of SSSD
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.
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
Index: sssd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sssd/F-11/sssd.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sssd.spec 23 Oct 2009 20:03:33 -0000 1.23
+++ sssd.spec 26 Oct 2009 13:43:50 -0000 1.24
@@ -3,7 +3,7 @@
Name: sssd
Version: 0.7.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: Applications/System
Summary: System Security Services Daemon
# The entire source code is GPLv3+ except replace/ which is LGPLv3+
@@ -15,6 +15,8 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{na
### Patches ###
+Patch1: 0001-Fix-migration-script-for-pre-0.5-local-domains.patch
+
### Dependencies ###
Requires: libldb >= 0.9.3
@@ -73,6 +75,8 @@ service.
%prep
%setup -q
+%patch1 -p1 -b .upgrade_fixes
+
%build
%configure \
--without-tests \
@@ -190,6 +194,9 @@ fi
%postun client -p /sbin/ldconfig
%changelog
+* Mon Oct 26 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.7.0-2
+- Fix upgrade issues from old (pre-0.5.0) releases of SSSD
+
* Fri Oct 23 2009 Stephen Gallagher <sgallagh at redhat.com> - 0.7.0-1
- New upstream release 0.7.0
- Previous message (by thread): rpms/squidGuard/F-12 squidGuard-1.4-20091015.patch, NONE, 1.1 squidGuard-1.4-20091019.patch, NONE, 1.1 squidGuard.spec, 1.20, 1.21
- Next message (by thread): rpms/nrpe/devel import.log,1.2,1.3 nrpe.spec,1.16,1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list