diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-07-28 17:14:28 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-07-29 18:17:44 +1000 |
| commit | 03f92508ef2ebb4e7790f612e3f833382c691051 (patch) | |
| tree | 74c7d7cf500e7861547c620035c68f4c80128a72 /source4/scripting/python/samba/netcmd/gpo.py | |
| parent | 8dda0ef57fa908c94c14d2521ded883ceb253b2f (diff) | |
| download | samba-03f92508ef2ebb4e7790f612e3f833382c691051.tar.gz samba-03f92508ef2ebb4e7790f612e3f833382c691051.tar.xz samba-03f92508ef2ebb4e7790f612e3f833382c691051.zip | |
samba-tool: use ldb.binary_encode() on search expression elements
this allows us to deal with search elements containing characters that
must be escaped in LDAP
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'source4/scripting/python/samba/netcmd/gpo.py')
| -rw-r--r-- | source4/scripting/python/samba/netcmd/gpo.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/scripting/python/samba/netcmd/gpo.py b/source4/scripting/python/samba/netcmd/gpo.py index 72c157d00a0..e59b79dbc0c 100644 --- a/source4/scripting/python/samba/netcmd/gpo.py +++ b/source4/scripting/python/samba/netcmd/gpo.py @@ -131,10 +131,10 @@ def get_gpo_info(samdb, gpo=None, displayname=None, dn=None): search_scope = ldb.SCOPE_ONELEVEL if gpo is not None: - search_expr = "(&(objectClass=groupPolicyContainer)(name=%s))" % gpo + search_expr = "(&(objectClass=groupPolicyContainer)(name=%s))" % ldb.binary_encode(gpo) if displayname is not None: - search_expr = "(&(objectClass=groupPolicyContainer)(displayname=%s))" % displayname + search_expr = "(&(objectClass=groupPolicyContainer)(displayname=%s))" % ldb.binary_encode(displayname) if dn is not None: base_dn = dn @@ -253,7 +253,7 @@ class cmd_list(Command): try: msg = self.samdb.search(expression='(&(|(samAccountName=%s)(samAccountName=%s$))(objectClass=User))' % - (username,username)) + (ldb.binary_encode(username),ldb.binary_encode(username))) user_dn = msg[0].dn except Exception, e: raise CommandError("Failed to find account %s" % username, e) |