From: Douglas Bagnall Date: Wed, 18 Nov 2020 22:24:25 +0000 (+1300) Subject: samba-tool drs: move attr_default to common X-Git-Tag: samba-4.14.0rc1~482 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=816dee1a132e6b586de8b0123fd8e9572aff4c32;p=thirdparty%2Fsamba.git samba-tool drs: move attr_default to common Signed-off-by: Douglas Bagnall Reviewed-by: Noel Power --- diff --git a/python/samba/netcmd/common.py b/python/samba/netcmd/common.py index c1923fcbed2..bb17bfa10f2 100644 --- a/python/samba/netcmd/common.py +++ b/python/samba/netcmd/common.py @@ -133,3 +133,10 @@ def timestamp_to_mins(timestamp_str): def timestamp_to_days(timestamp_str): """Converts a timestamp in -100 nanosecond units to days""" return timestamp_to_mins(timestamp_str) / (60 * 24) + + +def attr_default(msg, attrname, default): + '''get an attribute from a ldap msg with a default''' + if attrname in msg: + return msg[attrname][0] + return default diff --git a/python/samba/netcmd/drs.py b/python/samba/netcmd/drs.py index 023b09d0506..5b439f8e6e1 100644 --- a/python/samba/netcmd/drs.py +++ b/python/samba/netcmd/drs.py @@ -33,6 +33,7 @@ from samba.netcmd import ( Option, SuperCommand, ) +from samba.netcmd.common import attr_default from samba.samdb import SamDB from samba import drs_utils, nttime2string, dsdb from samba.dcerpc import drsuapi, misc @@ -75,13 +76,6 @@ def drs_errmsg(werr): return "failed, result %u (%s)" % (ecode, estring) -def attr_default(msg, attrname, default): - '''get an attribute from a ldap msg with a default''' - if attrname in msg: - return msg[attrname][0] - return default - - def drs_parse_ntds_dn(ntds_dn): '''parse a NTDS DN returning a site and server''' a = ntds_dn.split(',')