git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0a88be8
)
python/samdb: Allow samdb.normalize_dn_in_domain() to take an ldb.Dn()
author
Andrew Bartlett
<abartlet@samba.org>
Thu, 8 Feb 2018 03:27:17 +0000
(16:27 +1300)
committer
Andrew Bartlett
<abartlet@samba.org>
Thu, 8 Feb 2018 03:58:09 +0000
(
04:58
+0100)
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
python/samba/samdb.py
patch
|
blob
|
history
diff --git
a/python/samba/samdb.py
b/python/samba/samdb.py
index 5b04c982673343b18e589f6ff251ff83a26652a6..f4e97dc0c0195efd43c529818a781f7774cc79de 100644
(file)
--- a/
python/samba/samdb.py
+++ b/
python/samba/samdb.py
@@
-1004,6
+1004,10
@@
accountExpires: %u
:param dn: relative dn
"""
domain_dn = ldb.Dn(self, self.domain_dn())
+
+ if isinstance(dn, ldb.Dn):
+ dn = str(dn)
+
full_dn = ldb.Dn(self, dn)
if not full_dn.is_child_of(domain_dn):
full_dn.add_base(domain_dn)