diff options
| author | David Mulder <dmulder@samba.org> | 2022-12-07 09:51:12 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2022-12-21 02:04:37 +0000 |
| commit | e6156b135021db5a6335bb8779acefff2f6a0bd3 (patch) | |
| tree | 6400e1a08611392ab65e76cef65a731d05653509 | |
| parent | d170d8cfbb4571af8b66f1dcd7355a598b0abd1f (diff) | |
| download | samba-e6156b135021db5a6335bb8779acefff2f6a0bd3.tar.gz | |
gp: Re-create files if manually removed
Signed-off-by: David Mulder <dmulder@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | python/samba/gp/gpclass.py | 3 | ||||
| -rw-r--r-- | selftest/knownfail.d/gpo | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/python/samba/gp/gpclass.py b/python/samba/gp/gpclass.py index 42ce3dc63fb..d6ada1dbaad 100644 --- a/python/samba/gp/gpclass.py +++ b/python/samba/gp/gpclass.py @@ -544,7 +544,8 @@ class gp_file_applier(gp_applier): # Ignore removal if this policy is applied and hasn't changed old_val_hash, old_val_files = self.__parse_value(old_val, sep) if (old_val_hash != value_hash or \ - self.cache_get_apply_state() == GPOSTATE.ENFORCE): + self.cache_get_apply_state() == GPOSTATE.ENFORCE) or \ + not all([os.path.exists(f) for f in old_val_files]): self.unapply(guid, attribute, old_val_files) else: # If policy is already applied, skip application diff --git a/selftest/knownfail.d/gpo b/selftest/knownfail.d/gpo deleted file mode 100644 index 7ea9bca77f8..00000000000 --- a/selftest/knownfail.d/gpo +++ /dev/null @@ -1 +0,0 @@ -samba.tests.gpo.GPOTests.test_gp_centrify_sudoers_ext* |