diff options
| author | Matthieu Patou <mat+Informatique.Samba@matws.net> | 2009-11-27 17:37:14 +0300 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-11-28 09:56:06 +1100 |
| commit | db41a0afc6412934e166b8a3ed428ce549ba7c66 (patch) | |
| tree | 2b8888e0c0a627523382a3c7521b81494662c288 /source4/scripting/python/samba/schema.py | |
| parent | f7c28db475261fa859e8f1888a629ced6c447c60 (diff) | |
| download | samba-db41a0afc6412934e166b8a3ed428ce549ba7c66.tar.gz samba-db41a0afc6412934e166b8a3ed428ce549ba7c66.tar.xz samba-db41a0afc6412934e166b8a3ed428ce549ba7c66.zip | |
s4: fix SD update and password change in upgrade script
- reserve a new Samba OID for recalculate SD control
- fix the update SD function
- fix handling of kvno in the update_machine_account_password function
- fix handling of handles in RPC winreg server
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source4/scripting/python/samba/schema.py')
| -rw-r--r-- | source4/scripting/python/samba/schema.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/schema.py b/source4/scripting/python/samba/schema.py index 6f45859ead..8913e53b00 100644 --- a/source4/scripting/python/samba/schema.py +++ b/source4/scripting/python/samba/schema.py @@ -46,7 +46,7 @@ def get_schema_descriptor(domain_sid): "(AU;SA;CR;;;DU)(OU;SA;CR;e12b56b6-0a95-11d1-adbb-00c04fd8d5cd;;WD)" \ "(OU;SA;CR;45ec5156-db7e-47bb-b53f-dbeb2d03c40f;;WD)" sec = security.descriptor.from_sddl(sddl, domain_sid) - return b64encode(ndr_pack(sec)) + return ndr_pack(sec) class Schema(object): @@ -79,7 +79,7 @@ class Schema(object): "SERVERDN": serverdn, }) - descr = get_schema_descriptor(domain_sid) + descr = b64encode(get_schema_descriptor(domain_sid)) self.schema_dn_add = read_and_sub_file(setup_path("provision_schema_basedn.ldif"), {"SCHEMADN": schemadn, "DESCRIPTOR": descr |