The branch, master has been updated
via 261ef9d5b62 dbcheck: fix the err_empty_attribute() check
via dd6f0dad218 dbcheck: use the str() value of the "name" attribute
from 52bf5c25261 s3:script: Fix running cp in modprinter.pl
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 261ef9d5b62f0d49f858717e6d8b4b41f008efb5
Author: Stefan Metzmacher <[email protected]>
Date: Tue Mar 19 13:16:59 2019 +0100
dbcheck: fix the err_empty_attribute() check
ldb.bytes('') == '' is never True in python3,
we nee ldb.bytes('') == b'' in order to
check that on attribute has an empty value,
that seems to work for python2 and python3.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13843
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Noel Power <[email protected]>
Autobuild-User(master): Stefan Metzmacher <[email protected]>
Autobuild-Date(master): Thu Mar 21 18:15:20 UTC 2019 on sn-devel-144
commit dd6f0dad218ec1d5aa38ea8aa6848ec81035cb3f
Author: Stefan Metzmacher <[email protected]>
Date: Tue Mar 19 13:05:16 2019 +0100
dbcheck: use the str() value of the "name" attribute
We do the same with the rdn attribute value
and we need the same logic on both in order to
check they are the same.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13816
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Noel Power <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
python/samba/dbchecker.py | 4 ++--
.../expected-dbcheck-link-output-lost-deleted-user1.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py
index 98508192c10..a0500c6c578 100644
--- a/python/samba/dbchecker.py
+++ b/python/samba/dbchecker.py
@@ -2311,7 +2311,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn),
str(to_base)))
self.report("ERROR: Not fixing num_values(%d) for '%s' on
'%s'" %
(len(obj[attrname]), attrname, str(obj.dn)))
else:
- name_val = obj[attrname][0]
+ name_val = str(obj[attrname][0])
if str(attrname).lower() == str(obj.dn.get_rdn_name()).lower():
object_rdn_attr = attrname
@@ -2445,7 +2445,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn),
str(to_base)))
# check for empty attributes
for val in obj[attrname]:
- if val == '':
+ if val == b'':
self.err_empty_attribute(dn, attrname)
error_count += 1
continue
diff --git
a/source4/selftest/provisions/release-4-5-0-pre1/expected-dbcheck-link-output-lost-deleted-user1.txt
b/source4/selftest/provisions/release-4-5-0-pre1/expected-dbcheck-link-output-lost-deleted-user1.txt
index 3c55de8fa01..1f5f2272bc1 100644
---
a/source4/selftest/provisions/release-4-5-0-pre1/expected-dbcheck-link-output-lost-deleted-user1.txt
+++
b/source4/selftest/provisions/release-4-5-0-pre1/expected-dbcheck-link-output-lost-deleted-user1.txt
@@ -1,7 +1,7 @@
Checking 232 objects
WARNING: no target object found for GUID component link lastKnownParent in
deleted object
CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,OU=removed,DC=release-4-5-0-pre1,DC=samba,DC=corp
-
<GUID=f28216e9-1234-5678-8b2d-6bb229563b62>;OU=removed,DC=release-4-5-0-pre1,DC=samba,DC=corp
Not removing dangling one-way link on deleted object (tombstone garbage
collection in progress?)
-ERROR: wrong
dn[CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,OU=removed,DC=release-4-5-0-pre1,DC=samba,DC=corp]
cn='fred\nDEL:2301a64c-1234-5678-851e-12d4a711cfb4'
name=b'fred\nDEL:2301a64c-1234-5678-851e-12d4a711cfb4'
new_dn[CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,CN=Deleted
Objects,DC=release-4-5-0-pre1,DC=samba,DC=corp]
+ERROR: wrong
dn[CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,OU=removed,DC=release-4-5-0-pre1,DC=samba,DC=corp]
name='fred\nDEL:2301a64c-1234-5678-851e-12d4a711cfb4'
new_dn[CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,CN=Deleted
Objects,DC=release-4-5-0-pre1,DC=samba,DC=corp]
Rename
CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,OU=removed,DC=release-4-5-0-pre1,DC=samba,DC=corp
to CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,CN=Deleted
Objects,DC=release-4-5-0-pre1,DC=samba,DC=corp? [YES]
Renamed
CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,OU=removed,DC=release-4-5-0-pre1,DC=samba,DC=corp
into CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,CN=Deleted
Objects,DC=release-4-5-0-pre1,DC=samba,DC=corp
WARNING: parent object not found for
CN=fred\0ADEL:2301a64c-1234-5678-851e-12d4a711cfb4,OU=removed,DC=release-4-5-0-pre1,DC=samba,DC=corp
--
Samba Shared Repository
