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

ldapcmp: also ignore operatingSystem similar to operatingSystemVersion

2023-07-19T03:31:30+00:00

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

python:samba:netcmd: Fix code spelling

2023-06-23T13:44:31+00:00

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

python:netcmd: Decode return value of find_netbios() from bytes into string

2023-03-14T06:16:30+00:00

ERROR(): uncaught exception - replace() argument 1 must be
str, not bytes
  File "bin/python/samba/netcmd/__init__.py", line 230, in _run
    return self.run(*args, **kwargs)
           ^^^^^^^^^^^^^^^^^^^^^^^^^
  File "bin/python/samba/netcmd/ldapcmp.py", line 966, in run
    if b1.diff(b2):
       ^^^^^^^^^^^
  File "bin/python/samba/netcmd/ldapcmp.py", line 790, in diff
    if object1 == object2:
       ^^^^^^^^^^^^^^^^^^
  File "bin/python/samba/netcmd/ldapcmp.py", line 557, in __eq__
    return self.cmp_attrs(other)
           ^^^^^^^^^^^^^^^^^^^^^
  File "bin/python/samba/netcmd/ldapcmp.py", line 656, in cmp_attrs
    p = [self.fix_domain_netbios(j) for j in m]
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "bin/python/samba/netcmd/ldapcmp.py", line 656, in 
    p = [self.fix_domain_netbios(j) for j in m]
         ^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "bin/python/samba/netcmd/ldapcmp.py", line 542, in fix_domain_netbios
    res = res.replace(self.con.domain_netbios.lower(), self.con.domain_netbios.upper())
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

BUGS: https://bugzilla.samba.org/show_bug.cgi?id=15330

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

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