From 399eae13a1675e3af58dc07ca719c1ab3d41fd06 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 19 Aug 2011 17:36:57 +1000
Subject: 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
---
 source4/param/loadparm.c                    | 9 +++++++++
 source4/setup/provision.smb.conf.dc         | 2 ++
 source4/setup/provision.smb.conf.member     | 3 +++
 source4/setup/provision.smb.conf.standalone | 3 +++
 4 files changed, 17 insertions(+)

(limited to 'source4')

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index ba9668a1c6..74c0550522 100644
--- 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 3fd2e77770..fd1ffd3634 100644
--- 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 6c57b5a8d3..0fc4de530b 100644
--- 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 6c57b5a8d3..0fc4de530b 100644
--- 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
+
-- 
cgit