s4-provision set passdb backend to 'samba4' in template smb.conf files

This will allow smbpasswd, net sam and pdbedit to 'just work' against
the newly created databases.

Andrew Bartlett

diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c
index 3aadda1bd080082f36a586eabdf4d1ddcfd3f77f..abd7dbeabe2c47286a58c0834686d9817549f932 100644 (file)
--- a/source3/param/loadparm_ctx.c
+++ b/source3/param/loadparm_ctx.c
@@ -75,7 +75,9 @@ static const struct loadparm_s3_context s3_fns =
 
        .private_dir = lp_private_dir,
        .ncalrpc_dir = lp_ncalrpc_dir,
-       .lockdir = lp_lockdir
+       .lockdir = lp_lockdir,
+
+       .passdb_backend = lp_passdb_backend
 };
 
 const struct loadparm_s3_context *loadparm_s3_context(void)

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index ba9668a1c645488e83add8c19fc668c8e4ba237b..74c05505222fea9c03fda6a5f4eeeaec46ec2fda 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -319,6 +319,14 @@ static struct parm_struct parm_table[] = {
                .special        = NULL,
                .enum_list      = NULL
        },
+       {
+               .label          = "passdb backend",
+               .type           = P_STRING,
+               .p_class        = P_GLOBAL,
+               .offset         = GLOBAL_VAR(passdb_backend),
+               .special        = NULL,
+               .enum_list      = NULL
+       },
        {
                .label          = "dcerpc endpoint servers",
                .type           = P_LIST,
@@ -1511,6 +1519,7 @@ FN_GLOBAL_LIST(nsupdate_command, szNSUpdateCommand)
 FN_GLOBAL_LIST(dcerpc_endpoint_servers, dcerpc_ep_servers)
 FN_GLOBAL_LIST(server_services, server_services)
 FN_GLOBAL_STRING(ntptr_providor, ntptr_providor)
+FN_GLOBAL_STRING(passdb_backend, passdb_backend)
 FN_GLOBAL_STRING(auto_services, szAutoServices)
 FN_GLOBAL_STRING(passwd_chat, szPasswdChat)
 FN_GLOBAL_LIST(passwordserver, szPasswordServers)

diff --git a/source4/setup/provision.smb.conf.dc b/source4/setup/provision.smb.conf.dc
index 3fd2e77770125b0413c436b4834048b9db76f4c5..fd1ffd36343bc93dfbc369fe4a0f65828b176d5d 100644 (file)
--- a/source4/setup/provision.smb.conf.dc
+++ b/source4/setup/provision.smb.conf.dc
@@ -8,6 +8,8 @@
        ${STATEDIR_LINE}
        ${CACHEDIR_LINE}
 
+       passdb backend = samba4
+
 [netlogon]
        path = ${NETLOGONPATH}
        read only = no

diff --git a/source4/setup/provision.smb.conf.member b/source4/setup/provision.smb.conf.member
index 6c57b5a8d3f5f4c7cab9d0fb5a13f36bb8c23a6f..0fc4de530b6ee4c788505fd9f2994619d43410b8 100644 (file)
--- a/source4/setup/provision.smb.conf.member
+++ b/source4/setup/provision.smb.conf.member
@@ -7,3 +7,6 @@
        ${LOCKDIR_LINE}
        ${STATEDIR_LINE}
        ${CACHEDIR_LINE}
+
+       passdb backend = samba4
+

diff --git a/source4/setup/provision.smb.conf.standalone b/source4/setup/provision.smb.conf.standalone
index 6c57b5a8d3f5f4c7cab9d0fb5a13f36bb8c23a6f..0fc4de530b6ee4c788505fd9f2994619d43410b8 100644 (file)
--- a/source4/setup/provision.smb.conf.standalone
+++ b/source4/setup/provision.smb.conf.standalone
@@ -7,3 +7,6 @@
        ${LOCKDIR_LINE}
        ${STATEDIR_LINE}
        ${CACHEDIR_LINE}
+
+       passdb backend = samba4
+