IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-23 07:33:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

NSSDB: use preferred convert command

Browse Source 
After further testing, Kai Engert proposed to use -N with -f -@ to
convert a NSSDB from DBM to SQL format.

https://fedoraproject.org/wiki/Changes/NSSDefaultFileFormatSql#Upgrade.2Fcompatibility_impact

https://pagure.io/freeipa/issue/7049

Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
Christian Heimes 2017-11-30 13:52:34 +01:00
parent 891cced446
commit 1505922c2b
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ipapython/certdb.py
View File

@ -347,6 +347,15 @@ class NSSDatabase(object):
def convert_db(self, rename_old=True): def convert_db(self, rename_old=True):
"""Convert DBM database format to SQL database format """Convert DBM database format to SQL database format
**WARNING** **WARNING** **WARNING** **WARNING** **WARNING**
The caller must ensure that no other process or service is
accessing the NSSDB during migration. The DBM format does not support
multiple processes. If more than one process opens a DBM NSSDB for
writing, the database will become **irreparably corrupted**.
**WARNING** **WARNING** **WARNING** **WARNING** **WARNING**
""" """
if (self.dbtype == 'sql' or if (self.dbtype == 'sql' or
os.path.isfile(os.path.join(self.secdir, "cert9.db"))): os.path.isfile(os.path.join(self.secdir, "cert9.db"))):
@ -356,17 +365,12 @@ class NSSDatabase(object):
# use certutil to migrate db to new format # use certutil to migrate db to new format
# see https://bugzilla.mozilla.org/show_bug.cgi?id=1415912 # see https://bugzilla.mozilla.org/show_bug.cgi?id=1415912
# https://fedoraproject.org/wiki/Changes/NSSDefaultFileFormatSql
args = [ args = [
paths.CERTUTIL, paths.CERTUTIL,
'-d', 'sql:{}'.format(self.secdir), '-d', 'sql:{}'.format(self.secdir), '-N',
'-f', self.pwd_file, '-f', self.pwd_file, '-@', self.pwd_file
] ]
if self.list_keys():
# has keys, use 'list keys' in read-write mode
args.extend(['-K', '-X'])
else:
# no keys, create new DB with auto-migrate
args.extend(['-N', '-@', self.pwd_file])
ipautil.run(args) ipautil.run(args)
# retain file ownership and permission, backup old files # retain file ownership and permission, backup old files