[SCM] Samba Shared Repository - branch master updated
Björn Baumbach
bbaumbach at samba.org
Wed Oct 23 15:55:02 UTC 2019
The branch, master has been updated
via 6e8c3ae6e9b samba-tool: py3 compatiblity in 'user syncpasswords --daemon'
from 263bec1b8d0 replace: Only link libnsl and libsocket if requrired
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6e8c3ae6e9be38fdd1d1693b93c8629391799b19
Author: Heinz Hoelzl <heinz.hoelzl at gvcc.net>
Date: Thu Oct 10 10:14:15 2019 +1300
samba-tool: py3 compatiblity in 'user syncpasswords --daemon'
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14154
Signed-off-by: Heinz Hölzl <heinz.hoelzl at gvcc.net>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Björn Baumbach <bb at sernet.de>
Autobuild-User(master): Björn Baumbach <bb at sernet.de>
Autobuild-Date(master): Wed Oct 23 15:54:43 UTC 2019 on sn-devel-184
-----------------------------------------------------------------------
Summary of changes:
python/samba/netcmd/user.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/python/samba/netcmd/user.py b/python/samba/netcmd/user.py
index affbbf067c1..cadd80fd991 100644
--- a/python/samba/netcmd/user.py
+++ b/python/samba/netcmd/user.py
@@ -1958,7 +1958,8 @@ samba-tool user syncpasswords --terminate \\
assert res is None
input = "%s" % (ldif)
- reply = sync_command_p.communicate(input)[0]
+ reply = sync_command_p.communicate(
+ input.encode('utf-8'))[0].decode('utf-8')
log_msg("%s\n" % (reply))
res = sync_command_p.poll()
if res is None:
--
Samba Shared Repository
More information about the samba-cvs
mailing list