From 4e4953dd48467cf96a17cc48ccf1139e175845fe Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 5 Aug 2011 13:09:35 +1000 Subject: [PATCH] s4-samdb: support relative paths in SamDB() connect don't add the private path unless the database doesn't exist with the supplied path --- source4/scripting/python/samba/samdb.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py index 46a7fea32e3..70f73da6f4e 100644 --- a/source4/scripting/python/samba/samdb.py +++ b/source4/scripting/python/samba/samdb.py @@ -27,6 +27,7 @@ import samba import ldb import time import base64 +import os from samba import dsdb from samba.ndr import ndr_unpack, ndr_pack from samba.dcerpc import drsblobs, misc @@ -62,7 +63,7 @@ class SamDB(samba.Ldb): dsdb._dsdb_set_am_rodc(self, am_rodc) def connect(self, url=None, flags=0, options=None): - if self.lp is not None: + if self.lp is not None and not os.path.exists(url): url = self.lp.private_path(url) self.url = url -- 2.34.1