samba-tool: Create unix user with modified template homedir

Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/python/samba/netcmd/user.py b/python/samba/netcmd/user.py
index 95c21f52a04f4984ca0afe184eb795620e979b8f..b76d55b7d40f56d4af71162e0d851439ef406c7b 100644 (file)
--- a/python/samba/netcmd/user.py
+++ b/python/samba/netcmd/user.py
@@ -3006,11 +3006,12 @@ The users gecos field will be set to 'User4 test'
                 res = samdb.search(searchdn,
                                    scope=ldb.SCOPE_SUBTREE,
                                    expression=filter)
-                unix_domain = res[0]["nETBIOSName"][0]
+                unix_domain = res[0]["nETBIOSName"][0].decode()
             except IndexError:
                 raise CommandError('Unable to find Unix domain')
 
-            unix_home = "/home/{0}/{1}".format(unix_domain, username)
+            tmpl = lp.get('template homedir')
+            unix_home = tmpl.replace('%D', unix_domain).replace('%U', username)
 
         if not lp.get("idmap_ldb:use rfc2307"):
             self.outf.write("You are setting a Unix/RFC2307 UID & GID. "

diff --git a/selftest/knownfail.d/samba-tool b/selftest/knownfail.d/samba-tool
deleted file mode 100644 (file)
index 9f922a1..0000000
--- a/selftest/knownfail.d/samba-tool
+++ /dev/null
@@ -1 +0,0 @@
-samba.tests.samba_tool.user.samba.tests.samba_tool.user.UserCmdTestCase