From: Joseph Sutton Date: Fri, 3 Mar 2023 00:20:31 +0000 (+1300) Subject: tests/krb5: Allow adding members to a group and changing its type in a single operation X-Git-Tag: talloc-2.4.1~1462 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77188f4882448733d75b50c4add59841eef3838f;p=thirdparty%2Fsamba.git tests/krb5: Allow adding members to a group and changing its type in a single operation This is needed in order to get some specific group setups for tests. Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/tests/krb5/kdc_base_test.py b/python/samba/tests/krb5/kdc_base_test.py index f8a51e24280..3d9059b3510 100644 --- a/python/samba/tests/krb5/kdc_base_test.py +++ b/python/samba/tests/krb5/kdc_base_test.py @@ -877,7 +877,8 @@ class KDCBaseTest(RawKerberosTest): creds.set_tgs_supported_enctypes(supported_enctypes) creds.set_ap_supported_enctypes(supported_enctypes) - def add_to_group(self, account_dn, group_dn, group_attr, expect_attr=True): + def add_to_group(self, account_dn, group_dn, group_attr, expect_attr=True, + new_group_type=None): samdb = self.get_samdb() try: @@ -914,9 +915,14 @@ class KDCBaseTest(RawKerberosTest): msg = ldb.Message() msg.dn = group_dn - msg[group_attr] = ldb.MessageElement(list(members), - ldb.FLAG_MOD_REPLACE, - group_attr) + if new_group_type is not None: + msg['0'] = ldb.MessageElement( + common.normalise_int32(new_group_type), + ldb.FLAG_MOD_REPLACE, + 'groupType') + msg['1'] = ldb.MessageElement(list(members), + ldb.FLAG_MOD_REPLACE, + group_attr) cleanup = samdb.msg_diff(msg, orig_msg) self.ldb_cleanups.append(cleanup) samdb.modify(msg)