mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
ipa-client-samba uninstall: remove tdb files
ipa-client-samba uninstaller must remove samba *.tdb files in /var/lib/samba, /var/lib/samba/private and /var/lib/samba/lock. The current code calls rm on the relative path filename instead of building an absolute path filename, resulting in failure to remove the tdb files. Fixes: https://pagure.io/freeipa/issue/8687 Signed-off-by: Florence Blanc-Renaud <flo@redhat.com> Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
parent
f11a4c3df5
commit
91334b271a
@ -446,13 +446,17 @@ def uninstall(fstore, statestore, options):
|
||||
fstore.restore_file(paths.SMB_CONF)
|
||||
|
||||
# Remove samba's persistent and temporary tdb files
|
||||
tdb_files = [
|
||||
tdb_file
|
||||
for tdb_file in os.listdir(paths.SAMBA_DIR)
|
||||
if tdb_file.endswith(".tdb")
|
||||
]
|
||||
for tdb_file in tdb_files:
|
||||
ipautil.remove_file(tdb_file)
|
||||
# in /var/lib/samba and /var/lib/samba/private
|
||||
for smbpath in (paths.SAMBA_DIR,
|
||||
os.path.join(paths.SAMBA_DIR, "private"),
|
||||
os.path.join(paths.SAMBA_DIR, "lock")):
|
||||
tdb_files = [
|
||||
os.path.join(smbpath, tdb_file)
|
||||
for tdb_file in os.listdir(smbpath)
|
||||
if tdb_file.endswith(".tdb")
|
||||
]
|
||||
for tdb_file in tdb_files:
|
||||
ipautil.remove_file(tdb_file)
|
||||
|
||||
# Remove our keys from samba's keytab
|
||||
if os.path.exists(paths.SAMBA_KEYTAB):
|
||||
|
Loading…
Reference in New Issue
Block a user