From: David Mulder Date: Fri, 7 Aug 2020 20:15:30 +0000 (-0600) Subject: gpo: gp_krb_ext always uses set_kdc_tdb to update X-Git-Tag: talloc-2.3.2~699 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab347c861ce670d29773599c9d2572a42db0bdcb;p=thirdparty%2Fsamba.git gpo: gp_krb_ext always uses set_kdc_tdb to update Signed-off-by: David Mulder Reviewed-by: Douglas Bagnall --- diff --git a/python/samba/gp_sec_ext.py b/python/samba/gp_sec_ext.py index ebe8eec2624..070bde9fd60 100644 --- a/python/samba/gp_sec_ext.py +++ b/python/samba/gp_sec_ext.py @@ -52,8 +52,7 @@ class gp_krb_ext(gp_inf_ext): for section in settings.keys(): if section == str(self): for att, value in settings[section].items(): - update_samba, _ = self.mapper().get(att) - update_samba(att, value) + self.set_kdc_tdb(att, value) self.gp_db.delete(section, att) self.gp_db.commit() @@ -68,8 +67,8 @@ class gp_krb_ext(gp_inf_ext): if section == str(self): for key, value in inf_conf.items(section): att = gp_krb_ext.apply_map[key] - (update_samba, value_func) = self.mapper().get(att) - update_samba(att, value_func(value)) + value_func = self.mapper().get(att) + self.set_kdc_tdb(att, value_func(value)) self.gp_db.commit() def set_kdc_tdb(self, attribute, val): @@ -85,12 +84,9 @@ class gp_krb_ext(gp_inf_ext): self.gp_db.delete(str(self), attribute) def mapper(self): - return {'kdc:user_ticket_lifetime': (self.set_kdc_tdb, - lambda val: val), - 'kdc:service_ticket_lifetime': (self.set_kdc_tdb, - mins_to_hours), - 'kdc:renewal_lifetime': (self.set_kdc_tdb, - days_to_hours), + return {'kdc:user_ticket_lifetime': lambda val: val, + 'kdc:service_ticket_lifetime': mins_to_hours, + 'kdc:renewal_lifetime': days_to_hours, } def __str__(self):