netcmd: models: move object_sid field from User to base Model

Signed-off-by: Rob van der Linde <rob@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/python/samba/netcmd/domain/models/model.py b/python/samba/netcmd/domain/models/model.py
index fc503f4b87a03b1a0e0bed80d20f670b8376ba21..5f50014a172840fee659104c5af790c84b11dfea 100644 (file)
--- a/python/samba/netcmd/domain/models/model.py
+++ b/python/samba/netcmd/domain/models/model.py
@@ -31,7 +31,7 @@ from .constants import MODELS
 from .exceptions import (DeleteError, FieldError, NotFound, ProtectError,
                          UnprotectError)
 from .fields import (DateTimeField, DnField, Field, GUIDField, IntegerField,
-                     StringField)
+                     SIDField, StringField)
 from .query import Query
 
 
@@ -61,6 +61,7 @@ class Model(metaclass=ModelMeta):
     object_class = StringField("objectClass",
                                default=lambda obj: obj.get_object_class())
     object_guid = GUIDField("objectGUID")
+    object_sid = SIDField("objectSid")
     usn_changed = IntegerField("uSNChanged", hidden=True, readonly=True)
     usn_created = IntegerField("uSNCreated", hidden=True, readonly=True)
     when_changed = DateTimeField("whenChanged", hidden=True, readonly=True)

diff --git a/python/samba/netcmd/domain/models/user.py b/python/samba/netcmd/domain/models/user.py
index f934f7b33359e1b7484d7b5a608ff11e676eb604..151fbfab5d3747971e732dae638090500db76f13 100644 (file)
--- a/python/samba/netcmd/domain/models/user.py
+++ b/python/samba/netcmd/domain/models/user.py
@@ -24,8 +24,7 @@ from ldb import Dn
 
 from samba.dsdb import DS_GUID_USERS_CONTAINER
 
-from .fields import (DnField, EnumField, IntegerField, SIDField, StringField,
-                     NtTimeField)
+from .fields import DnField, EnumField, IntegerField, NtTimeField, StringField
 from .model import Model
 from .types import AccountType, UserAccountControl
 
@@ -35,7 +34,6 @@ class User(Model):
     account_type = EnumField("sAMAccountType", AccountType)
     assigned_policy = DnField("msDS-AssignedAuthNPolicy")
     assigned_silo = DnField("msDS-AssignedAuthNPolicySilo")
-    object_sid = SIDField("objectSid")
     bad_password_time = NtTimeField("badPasswordTime", readonly=True)
     bad_pwd_count = IntegerField("badPwdCount", readonly=True)
     code_page = IntegerField("codePage")