diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-08-19 17:36:57 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-08-22 09:00:59 +1000 |
| commit | 399eae13a1675e3af58dc07ca719c1ab3d41fd06 (patch) | |
| tree | 45ffc55030399a5855590de51015f5f64028d62c | |
| parent | d713f9e9f50dfe680f66798098ee5ede3ee80e06 (diff) | |
| download | samba-399eae13a1675e3af58dc07ca719c1ab3d41fd06.tar.gz samba-399eae13a1675e3af58dc07ca719c1ab3d41fd06.tar.bz2 samba-399eae13a1675e3af58dc07ca719c1ab3d41fd06.zip | |
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
| -rw-r--r-- | source3/param/loadparm_ctx.c | 4 | ||||
| -rw-r--r-- | source4/param/loadparm.c | 9 | ||||
| -rw-r--r-- | source4/setup/provision.smb.conf.dc | 2 | ||||
| -rw-r--r-- | source4/setup/provision.smb.conf.member | 3 | ||||
| -rw-r--r-- | source4/setup/provision.smb.conf.standalone | 3 |
5 files changed, 20 insertions, 1 deletions
diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c index 3aadda1bd0..abd7dbeabe 100644 --- 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 ba9668a1c6..74c0550522 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -320,6 +320,14 @@ static struct parm_struct parm_table[] = { .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, .p_class = P_GLOBAL, @@ -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 + |