python:tests/krb5: remember the objectGUID of created accounts

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/python/samba/tests/krb5/kdc_base_test.py b/python/samba/tests/krb5/kdc_base_test.py
index 7ea745d0cbc0de0dd3864aba2d7d49caa0726b9f..093b6712e8eedc910db4c593f14dfe827052bb0d 100644 (file)
--- a/python/samba/tests/krb5/kdc_base_test.py
+++ b/python/samba/tests/krb5/kdc_base_test.py
@@ -929,7 +929,8 @@ class KDCBaseTest(TestCaseInTempDir, RawKerberosTest):
         res = samdb.search(base=dn,
                            scope=ldb.SCOPE_BASE,
                            attrs=['msDS-KeyVersionNumber',
-                                  'objectSid'])
+                                  'objectSid',
+                                  'objectGUID'])
 
         kvno = res[0].get('msDS-KeyVersionNumber', idx=0)
         if kvno is not None:
@@ -940,6 +941,10 @@ class KDCBaseTest(TestCaseInTempDir, RawKerberosTest):
         sid = samdb.schema_format_value('objectSID', sid)
         sid = sid.decode('utf-8')
         creds.set_sid(sid)
+        guid = res[0].get('objectGUID', idx=0)
+        guid = samdb.schema_format_value('objectGUID', guid)
+        guid = guid.decode('utf-8')
+        creds.set_guid(guid)
 
         return (creds, dn)
 

diff --git a/python/samba/tests/krb5/raw_testcase.py b/python/samba/tests/krb5/raw_testcase.py
index 61a666a2b1f39899b3e9a8a0a25fa93ff54aad5f..995a5c78b11af561194b59187df5e074730b4082 100644 (file)
--- a/python/samba/tests/krb5/raw_testcase.py
+++ b/python/samba/tests/krb5/raw_testcase.py
@@ -407,6 +407,7 @@ class KerberosCredentials(Credentials):
         'forced_salt',
         'kvno',
         'sid',
+        'guid',
         'spn',
         'tgs_supported_enctypes',
         'upn',
@@ -440,6 +441,7 @@ class KerberosCredentials(Credentials):
         self.upn = None
         self.spn = None
         self.sid = None
+        self.guid = None
         self.account_type = None
 
         self.user_account_control = None
@@ -589,6 +591,12 @@ class KerberosCredentials(Credentials):
     def get_sid(self):
         return self.sid
 
+    def set_guid(self, guid):
+        self.guid = guid
+
+    def get_guid(self):
+        return self.guid
+
     def get_rid(self):
         sid = self.get_sid()
         if sid is None: