samba-tool user edit: simplify code
authorBjörn Baumbach <bb@sernet.de>
Wed, 13 Mar 2019 16:40:37 +0000 (17:40 +0100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 4 Jul 2019 02:07:20 +0000 (02:07 +0000)
Use "None"-changetype here, instead of "Add". This avoids the need to
remove the changetype line afterwards.

Signed-off-by: Björn Baumbach <bb@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
python/samba/netcmd/user.py

index 28ff617f12b3755fde9f356e1c4dd4301f045b9b..112756ea4f52a48948b786872a954e58f898e8cc 100644 (file)
@@ -2448,9 +2448,7 @@ LDAP server using the 'nano' editor.
             raise CommandError('Unable to find user "%s"' % (username))
 
         for msg in res:
-            r_ldif = samdb.write_ldif(msg, 1)
-            # remove 'changetype' line
-            result_ldif = re.sub('changetype: add\n', '', r_ldif)
+            result_ldif = samdb.write_ldif(msg, ldb.CHANGETYPE_NONE)
 
             if editor is None:
                 editor = os.environ.get('EDITOR')