diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2011-02-22 09:21:14 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2011-02-22 10:02:24 -0500 |
| commit | ac68ea3c6c633206a01db5a0b74b994ab0c29093 (patch) | |
| tree | d487970c5be168dc5ade13d91cc0367ba2343c23 /ipaserver/install/ldapupdate.py | |
| parent | 79d22f8341026450ba7ca564e24812c9351c7e70 (diff) | |
| download | freeipa-ac68ea3c6c633206a01db5a0b74b994ab0c29093.tar.gz freeipa-ac68ea3c6c633206a01db5a0b74b994ab0c29093.tar.xz freeipa-ac68ea3c6c633206a01db5a0b74b994ab0c29093.zip | |
Add default roles and permissions for HBAC, SUDO and pw policy
Created some default roles as examples. In doing so I realized that
we were completely missing default rules for HBAC, SUDO and password
policy so I added those as well.
I ran into a problem when the updater has a default record and an add
at the same time, it should handle it better now.
ticket 585
Diffstat (limited to 'ipaserver/install/ldapupdate.py')
| -rw-r--r-- | ipaserver/install/ldapupdate.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index e7411e3fb..958904950 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -213,7 +213,18 @@ class LDAPUpdate: return all_updates e = all_updates[dn] - e['updates'] = e['updates'] + update['updates'] + if 'default' in update: + if 'default' in e: + e['default'] = e['default'] + update['default'] + else: + e['default'] = update['default'] + elif 'updates' in update: + if 'updates' in e: + e['updates'] = e['updates'] + update['updates'] + else: + e['updates'] = update['updates'] + else: + logging.debug("Unknown key in updates %s" % update.keys()) all_updates[dn] = e @@ -289,7 +300,8 @@ class LDAPUpdate: """Create a task to update an index for an attribute""" # Sleep a bit to ensure previous operations are complete - time.sleep(5) + if self.live_run: + time.sleep(5) r = random.SystemRandom() |