summaryrefslogtreecommitdiff
path: root/python/samba/gp_sec_ext.py
diff options
context:
space:
mode:
authorDavid Mulder <dmulder@suse.com>2020-08-07 14:15:30 -0600
committerDavid Mulder <dmulder@samba.org>2020-08-27 15:59:33 +0000
commitab347c861ce670d29773599c9d2572a42db0bdcb (patch)
treee38453434cb5fad72cb253de672b859e269c1641 /python/samba/gp_sec_ext.py
parent5128dc7db324c08d036475e46f8edcc99565fed3 (diff)
downloadsamba-ab347c861ce670d29773599c9d2572a42db0bdcb.tar.gz
gpo: gp_krb_ext always uses set_kdc_tdb to update
Signed-off-by: David Mulder <dmulder@suse.com> Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'python/samba/gp_sec_ext.py')
-rw-r--r--python/samba/gp_sec_ext.py16
1 files changed, 6 insertions, 10 deletions
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):