diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2011-10-25 20:10:30 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-03-26 00:57:29 +0200 |
| commit | 438971e214e6f55f19148ed2afc03ec1c7066f65 (patch) | |
| tree | fdc6cd5ce73a4da1490e3fea85d8ce39c7f6ed41 /source4/scripting/python/samba/upgradehelpers.py | |
| parent | fa1c7615d0809a124109713e1b340f71d9c4594f (diff) | |
| download | samba-438971e214e6f55f19148ed2afc03ec1c7066f65.tar.gz samba-438971e214e6f55f19148ed2afc03ec1c7066f65.tar.xz samba-438971e214e6f55f19148ed2afc03ec1c7066f65.zip | |
LDB/s4 - do not use the "(dn=...)" syntax on filters anymore
Make it AD-compatible using "(distinguishedName=...)".
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/scripting/python/samba/upgradehelpers.py')
| -rw-r--r-- | source4/scripting/python/samba/upgradehelpers.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/scripting/python/samba/upgradehelpers.py b/source4/scripting/python/samba/upgradehelpers.py index d049fa2d9e1..14cc907cbd0 100644 --- a/source4/scripting/python/samba/upgradehelpers.py +++ b/source4/scripting/python/samba/upgradehelpers.py @@ -466,9 +466,9 @@ def update_secrets(newsecrets_ldb, secrets_ldb, messagefunc): listPresent.append(hash_new[k]) for entry in listMissing: - reference = newsecrets_ldb.search(expression="dn=%s" % entry, + reference = newsecrets_ldb.search(expression="distinguishedName=%s" % entry, base="", scope=SCOPE_SUBTREE) - current = secrets_ldb.search(expression="dn=%s" % entry, + current = secrets_ldb.search(expression="distinguishedName=%s" % entry, base="", scope=SCOPE_SUBTREE) delta = secrets_ldb.msg_diff(empty, reference[0]) for att in hashAttrNotCopied: @@ -481,9 +481,9 @@ def update_secrets(newsecrets_ldb, secrets_ldb, messagefunc): secrets_ldb.add(delta) for entry in listPresent: - reference = newsecrets_ldb.search(expression="dn=%s" % entry, + reference = newsecrets_ldb.search(expression="distinguishedName=%s" % entry, base="", scope=SCOPE_SUBTREE) - current = secrets_ldb.search(expression="dn=%s" % entry, base="", + current = secrets_ldb.search(expression="distinguishedName=%s" % entry, base="", scope=SCOPE_SUBTREE) delta = secrets_ldb.msg_diff(current[0], reference[0]) for att in hashAttrNotCopied: @@ -497,9 +497,9 @@ def update_secrets(newsecrets_ldb, secrets_ldb, messagefunc): delta.remove(att) for entry in listPresent: - reference = newsecrets_ldb.search(expression="dn=%s" % entry, base="", + reference = newsecrets_ldb.search(expression="distinguishedName=%s" % entry, base="", scope=SCOPE_SUBTREE) - current = secrets_ldb.search(expression="dn=%s" % entry, base="", + current = secrets_ldb.search(expression="distinguishedName=%s" % entry, base="", scope=SCOPE_SUBTREE) delta = secrets_ldb.msg_diff(current[0], reference[0]) for att in hashAttrNotCopied: @@ -678,7 +678,7 @@ def delta_update_basesamdb(refsampath, sampath, creds, session, lp, message): reference = refsam.search(expression="") for refentry in reference: - entry = sam.search(expression="dn=%s" % refentry["dn"], + entry = sam.search(expression="distinguishedName=%s" % refentry["dn"], scope=SCOPE_SUBTREE) if not len(entry): delta = sam.msg_diff(empty, refentry) |