samba-tool drs: move attr_default to common

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>

diff --git a/python/samba/netcmd/common.py b/python/samba/netcmd/common.py
index c1923fcbed239f69abc17a0108c10ff4a307770c..bb17bfa10f2f21f3bc8abfc9c8f8f5f6dbb89057 100644 (file)
--- 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 023b09d0506a4754a9203508978f3607b17a0266..5b439f8e6e1a7b93f4a850eb0cea134b62c0c3db 100644 (file)
--- 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(',')