From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Wed, 18 Nov 2020 22:24:47 +0000 (+1300)
Subject: samba-tool gpo: use common attr_default
X-Git-Tag: samba-4.14.0rc1~481
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e253c45c6d1cd76da682f72a0903f01bf094c8a1;p=thirdparty%2Fsamba.git

samba-tool gpo: use common attr_default

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

diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py
index bbaa0c17881..ca479207d6e 100644
--- a/python/samba/netcmd/gpo.py
+++ b/python/samba/netcmd/gpo.py
@@ -63,13 +63,7 @@ from samba.gp_parse.gp_inf import GptTmplInfParser
 from samba.gp_parse.gp_aas import GPAasParser
 from samba import param
 from samba.credentials import SMB_SIGNING_REQUIRED
-
-
-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
+from samba.netcmd.common import attr_default
 
 
 def gpo_flags_string(value):