samba-tool domain: add LDB Result to json encoders

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/netcmd/encoders.py b/python/samba/netcmd/encoders.py
index 7f0e41a5cb7b755aeb0fe7cbd1faaa7e7e555774..230309f74d94b33ffc392d4620367b49e7774fb0 100644 (file)
--- a/python/samba/netcmd/encoders.py
+++ b/python/samba/netcmd/encoders.py
@@ -25,7 +25,7 @@ from datetime import datetime
 from decimal import Decimal
 from enum import Enum
 
-from ldb import Dn
+from ldb import Dn, MessageElement, Result
 
 from samba.dcerpc.security import descriptor
 
@@ -40,8 +40,10 @@ class JSONEncoder(json.JSONEncoder):
     """
 
     def default(self, obj):
-        if isinstance(obj, (Decimal, Dn)):
+        if isinstance(obj, (Decimal, Dn, MessageElement)):
             return str(obj)
+        if isinstance(obj, Result):
+            return obj.msgs
         elif isinstance(obj, Enum):
             return str(obj.value)
         elif isinstance(obj, datetime):