samba.git/python/samba/netcmd/ldapcmp.py, branch talloc-2.4.0

samba-tool ldapcmp: use CommandError on auth failure

2022-09-06T21:12:36+00:00

Signed-off-by: Douglas Bagnall 
Reviewed-by: Andrew Bartlett

samba-tool ldapcmp: use CommandError, not assertion

2022-09-06T21:12:36+00:00

Signed-off-by: Douglas Bagnall 
Reviewed-by: Andrew Bartlett

samba-tool ldapcmp: do not assume common attributes

2022-09-06T21:12:36+00:00

This has caused numerous reports of

ERROR(): uncaught exception - 'serverReferenceBL'
  File /usr/lib/python3/dist-packages/samba/netcmd/__init__.py, line 185, in _run
    return self.run(*args, **kwargs)
  File /usr/lib/python3/dist-packages/samba/netcmd/ldapcmp.py, line 957, in run
    if b1.diff(b2):
  File /usr/lib/python3/dist-packages/samba/netcmd/ldapcmp.py, line 781, in diff
    if object1 == object2:
  File /usr/lib/python3/dist-packages/samba/netcmd/ldapcmp.py, line 549, in __eq__
    return self.cmp_attrs(other)
  File /usr/lib/python3/dist-packages/samba/netcmd/ldapcmp.py, line 590, in cmp_attrs
    if isinstance(self.attributes[x], list) and isinstance(other.attributes[x], list):

because other does not have attribute 'x'.

It is better to assume other.attributes[x] is None, which will compare
as unequal to whatever self.attributes[x] is, showing up as a diff
rather than a crash.

Signed-off-by: Douglas Bagnall 
Reviewed-by: Andrew Bartlett

samba-tool ldapcmp: use shorter names in cmp_attrs

2022-09-06T21:12:36+00:00

This simplifies a fix in the next commit.

Signed-off-by: Douglas Bagnall 
Reviewed-by: Andrew Bartlett

samba-tool ldapcmp: use ValueError, not Exception

2022-09-06T21:12:36+00:00

Signed-off-by: Douglas Bagnall 
Reviewed-by: Andrew Bartlett

python: Don't use deprecated escape sequences

2022-06-14T07:21:29+00:00

Certain escape sequences are not valid in Python string literals, and
will eventually result in a SyntaxError.

Signed-off-by: Joseph Sutton 
Reviewed-by: Andrew Bartlett 
Reviewed-by: Andreas Schneider

python: Remove redundant assignments

2022-05-10T05:19:34+00:00

Signed-off-by: Joseph Sutton 
Reviewed-by: Andreas Schneider

python: use raw string for regex with escape

2020-02-07T10:37:37+00:00

Python regards 'GPT\.INI$' as a string containing an invalid escape
sequence '\.', which is ignored (i.e. treated as the literal sequence
of those 2 characters), but only after Python has grumbled to itself,
and to you if you enabled DeprecationWarnings.

The proper thing to do here is use r-strings, like r'GPT\.INI$', which
tell Python that all backslashes are literal. Alternatively (as we do
once in this patch), the backslash can itself be escaped ('\\').

There are more problems of this nature in the build scripts.

Signed-off-by: Douglas Bagnall 
Reviewed-by: Noel Power

ldapcmp: ignore 'schemaInfo' if two domains are compared

2019-04-11T04:17:10+00:00

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13799

Signed-off-by: Stefan Metzmacher 
Reviewed-by: Andrew Bartlett 
Reviewed-by: Garming Sam

samba-tool ldapcmp: print DNs on predictable order

2018-11-21T06:46:20+00:00

Rather than unstable hash order. Ideally we'd do them in proper DN order.

Signed-off-by: Douglas Bagnall 
Reviewed-by: Andrew Bartlett